diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 860c204..7143819 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 saveDateTime="2022-09-12T08:34:14" projectname="Gun Run" version="3.26.3-Buenos Aires" saveUserFull="Timothy Allen" saveUser="tim">
+<qgis saveUser="tim" projectname="Gun Run" saveDateTime="2022-09-13T09:51:54" saveUserFull="Timothy Allen" version="3.26.3-Buenos Aires">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,251 +21,256 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group checked="Qt::Checked" expanded="1" name="Marshals" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Marshals">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0" expanded="1" providerKey="ogr" name="marshal_positions" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="marshal_positions" source="./marshal_positions.shp|layername=marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="marshal_positions [460]" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option name="legend/expressionFilter" value="" type="QString"/>
-            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
-            <Option name="showFeatureCount" value="1" type="int"/>
+            <Option value="marshal_positions [460]" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option value="1" type="int" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./extra_security.shp" checked="Qt::Unchecked" id="extra_security20170921130834191" patch_size="0,0" expanded="1" providerKey="ogr" name="extra_security" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="extra_security20170921130834191" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="extra_security" 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 source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" id="marshals_by_position20161003112326575" patch_size="0,0" expanded="1" providerKey="delimitedtext" name="marshals_by_position" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="marshals_by_position20161003112326575" legend_exp="" providerKey="delimitedtext" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="marshals_by_position" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="marshals_by_position" type="QString"/>
+            <Option value="marshals_by_position" type="QString" name="cached_name"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0" expanded="1" providerKey="virtual" name="complete_marshal_overview" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_exp="" providerKey="virtual" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="complete_marshal_overview" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0" expanded="0" providerKey="ogr" name="marshal_overviews" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_exp="" providerKey="ogr" expanded="0" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="marshal_overviews" source="./marshal overviews.shp|layername=marshal overviews">
         <customproperties>
           <Option type="Map">
-            <Option name="legend/expressionFilter" value="" type="QString"/>
-            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" expanded="1" name="Fencing and Cones" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Fencing and Cones">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" expanded="1" providerKey="ogr" name="fencing" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="fencing" source="./fencing.shp|layername=fencing">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="fencing" type="QString"/>
-            <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
-            <Option name="legend/expressionFilter" value="" type="QString"/>
-            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+            <Option value="fencing" type="QString" name="cached_name"/>
+            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" patch_size="-1,-1" expanded="1" providerKey="virtual" name="fence_groups" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="cone_only_groups_5655c566_c302_4743_a580_b3593f83c018" legend_exp="" providerKey="virtual" expanded="1" patch_size="-1,-1" checked="Qt::Unchecked" legend_split_behavior="0" name="cone_only_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'fenc%25'%20GROUP%20BY%20%22group%22">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" legend_exp="" providerKey="virtual" expanded="1" patch_size="-1,-1" checked="Qt::Unchecked" legend_split_behavior="0" name="fence_and_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],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group checked="Qt::Checked" expanded="1" name="Markers" groupLayer="">
+      <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Markers">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={ec24be51-a272-427e-8ee9-16cf66eedb24}" checked="Qt::Checked" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" patch_size="-1,-1" expanded="1" providerKey="memory" name="route_markers" legend_split_behavior="0" legend_exp="">
+        <layer-tree-layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" legend_exp="" providerKey="memory" expanded="1" patch_size="-1,-1" checked="Qt::Checked" legend_split_behavior="0" name="route_markers" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={c0adcfec-e05c-4a4f-bfa7-86263dc9029e}">
           <customproperties>
             <Option type="Map">
-              <Option name="cached_name" value="route_markers" type="QString"/>
+              <Option value="route_markers" type="QString" name="cached_name"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="all_routes" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option name="showFeatureCount" value="0" type="int"/>
+            <Option value="all_routes" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="0" type="int" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer 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" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0" expanded="0" providerKey="ogr" name="timelapse" legend_split_behavior="0" legend_exp="">
+    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_exp="" providerKey="ogr" expanded="0" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="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' ">
       <customproperties>
         <Option type="Map">
-          <Option name="cached_name" value="timelapse" type="QString"/>
+          <Option value="timelapse" type="QString" name="cached_name"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group checked="Qt::Checked" expanded="1" name="Feeding Stations" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Feeding Stations">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./water_tables.shp" checked="Qt::Checked" id="water_tables20170921142016467" patch_size="0,0" expanded="1" providerKey="ogr" name="water_tables" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="water_tables20170921142016467" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="water_tables" source="./water_tables.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="water_tables" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option value="water_tables" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Ask Me" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="0" checked="Qt::Unchecked" name="Ask Me">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" expanded="1" providerKey="ogr" name="poi_labels" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="poi_labels" type="QString"/>
+            <Option value="poi_labels" type="QString" name="cached_name"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" expanded="1" providerKey="ogr" name="directions_to_start" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="directions_to_start" type="QString"/>
+            <Option value="directions_to_start" type="QString" name="cached_name"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Residents Access" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="0" checked="Qt::Unchecked" name="Residents Access">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./mayor.shp" checked="Qt::Unchecked" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0" expanded="1" providerKey="ogr" name="mayor" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="mayor" source="./mayor.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="mayor" type="QString"/>
+            <Option value="mayor" type="QString" name="cached_name"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./viplabels.shp" checked="Qt::Unchecked" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0" expanded="1" providerKey="ogr" name="viplabels" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="viplabels" source="./viplabels.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="viplabels" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option value="viplabels" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./vipaccess.shp" checked="Qt::Unchecked" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0" expanded="1" providerKey="ogr" name="vipaccess" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="vipaccess" source="./vipaccess.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="vipaccess" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option value="vipaccess" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./golfaccess.shp" checked="Qt::Unchecked" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0" expanded="0" providerKey="ogr" name="golfaccess" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_exp="" providerKey="ogr" expanded="0" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="golfaccess" source="./golfaccess.shp">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" expanded="1" providerKey="ogr" name="residents_access_roads" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="residents_access_roads" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option value="residents_access_roads" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0" expanded="1" providerKey="ogr" name="residents_access" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="residents_access" source="./residents_access.shp|layername=residents_access">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" expanded="1" name="OSM data" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="OSM data">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./osm_roads.shp" checked="Qt::Checked" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0" expanded="0" providerKey="ogr" name="osm_roads" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_exp="" providerKey="ogr" expanded="0" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="osm_roads" source="./osm_roads.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="osm_roads [3887]" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option name="showFeatureCount" value="1" type="QString"/>
+            <Option value="osm_roads [3887]" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0" expanded="1" providerKey="ogr" name="osm_places" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="osm_places" source="./osm_places.shp|layername=osm_places">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="osm_places [7]" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option name="showFeatureCount" value="1" type="QString"/>
+            <Option value="osm_places [7]" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" expanded="1" name="Start and Finish pages" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Unchecked" name="Start and Finish pages">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./data-comments.shp" checked="Qt::Unchecked" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0" expanded="1" providerKey="ogr" name="data-comments" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="data-comments" 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 source="./start_finish_area.shp" checked="Qt::Unchecked" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0" expanded="1" providerKey="ogr" name="start_finish_area" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="start_finish_area" 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 checked="Qt::Unchecked" expanded="0" name="Elevation" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="0" checked="Qt::Unchecked" name="Elevation">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./capetownelevation-1m.shp" checked="Qt::Unchecked" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0" expanded="1" providerKey="ogr" name="capetownelevation-1m" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="capetownelevation-1m" source="./capetownelevation-1m.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="showFeatureCount" value="1" type="QString"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" expanded="1" name="Map" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Map">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0" expanded="0" providerKey="gdal" name="GDAL-City of Cape Town 2015 Aerial" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_exp="" providerKey="gdal" expanded="0" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="GDAL-City of Cape Town 2015 Aerial" source="./GDAL-City of Cape Town 2015 Aerial.xml">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="GDAL-City of Cape Town 2015 Aerial" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option value="GDAL-City of Cape Town 2015 Aerial" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer 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" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0" expanded="1" providerKey="wms" name="Outlines" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" legend_exp="" providerKey="wms" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="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">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="Outlines" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option value="Outlines" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -296,44 +301,46 @@
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
       <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
       <item>route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e</item>
+      <item>cone_only_groups_5655c566_c302_4743_a580_b3593f83c018</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings intersection-snapping="1" tolerance="10" mode="3" scaleDependencyMode="0" enabled="0" type="1" minScale="0" unit="1" self-snapping="1" maxScale="0">
+  <snapping-settings tolerance="10" unit="1" intersection-snapping="1" mode="3" minScale="0" scaleDependencyMode="0" maxScale="0" enabled="0" self-snapping="1" type="1">
     <individual-layer-settings>
-      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" tolerance="12" enabled="0" type="0" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" tolerance="12" enabled="0" type="0" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="water_tables20170921142016467" tolerance="0" enabled="0" type="2" units="2" minScale="0" maxScale="0"/>
-      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" enabled="1" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="extra_security20170921130834191" tolerance="0" enabled="0" type="2" units="2" minScale="0" maxScale="0"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="0"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="cone_only_groups_5655c566_c302_4743_a580_b3593f83c018" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="0"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="0"/>
+      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="1"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" minScale="0" maxScale="0" enabled="1" units="1" type="2"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="1"/>
+      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="1"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="water_tables20170921142016467" tolerance="0" minScale="0" maxScale="0" enabled="0" units="2" type="2"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="1"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="extra_security20170921130834191" tolerance="0" minScale="0" maxScale="0" enabled="0" units="2" type="2"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <polymorphicRelations/>
-  <mapcanvas name="theMapCanvas" annotationsVisible="1">
+  <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.38171185633030547</xmin>
-      <ymin>-33.92253613496937703</ymin>
-      <xmax>18.43166587763301578</xmax>
-      <ymax>-33.89636262093823404</ymax>
+      <xmin>18.40881175236639322</xmin>
+      <ymin>-33.90881640278549725</ymin>
+      <xmax>18.4213002576920708</xmax>
+      <ymax>-33.9022730242777115</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -354,161 +361,166 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup checked="Qt::Checked" open="true" name="Marshals">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="marshal_positions" showFeatureCount="1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <legendgroup checked="Qt::Checked" name="Marshals" open="true">
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" name="marshal_positions" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="extra_security" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="extra_security" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="marshals_by_position" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="marshals_by_position" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="complete_marshal_overview" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="complete_marshal_overview" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="marshal_overviews" showFeatureCount="0">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="marshal_overviews" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="true" name="Fencing and Cones">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="fencing" showFeatureCount="0">
-        <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 showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="fencing" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="fence_groups" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="cone_only_groups" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="cone_only_groups_5655c566_c302_4743_a580_b3593f83c018" isInOverview="0" visible="0"/>
+        </filegroup>
+      </legendlayer>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="fence_and_cone_groups" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Routes">
-      <legendgroup checked="Qt::Checked" open="true" name="Markers">
-        <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="route_markers" showFeatureCount="0">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+    <legendgroup checked="Qt::Checked" name="Routes" open="true">
+      <legendgroup checked="Qt::Checked" name="Markers" open="true">
+        <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="route_markers" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" isInOverview="0" visible="1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="all_routes" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="all_routes" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="timelapse" showFeatureCount="0">
-      <filegroup open="false" hidden="false">
-        <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
+    <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="timelapse" open="false">
+      <filegroup hidden="false" open="false">
+        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
       </filegroup>
     </legendlayer>
-    <legendgroup checked="Qt::Checked" open="true" name="Feeding Stations">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="water_tables" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="water_tables20170921142016467"/>
+    <legendgroup checked="Qt::Checked" name="Feeding Stations" open="true">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="water_tables" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="poi_labels" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+    <legendgroup checked="Qt::Unchecked" name="Ask Me" open="false">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="poi_labels" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="directions_to_start" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="directions_to_start" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="mayor" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
+    <legendgroup checked="Qt::Unchecked" name="Residents Access" open="false">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="mayor" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="viplabels" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="viplabels" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="vipaccess" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="vipaccess" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="golfaccess" showFeatureCount="0">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="golfaccess" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access_roads" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access_roads" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="false" name="osm_roads" showFeatureCount="1">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <legendgroup checked="Qt::Checked" name="OSM data" open="true">
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" name="osm_roads" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="osm_places" showFeatureCount="1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" name="osm_places" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="true" name="Start and Finish pages">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="data-comments" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+    <legendgroup checked="Qt::Unchecked" name="Start and Finish pages" open="true">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="data-comments" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="start_finish_area" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="start_finish_area" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="capetownelevation-1m" showFeatureCount="1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
+    <legendgroup checked="Qt::Unchecked" name="Elevation" open="false">
+      <legendlayer showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1" name="capetownelevation-1m" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Map">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <legendgroup checked="Qt::Checked" name="Map" open="true">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="Outlines" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="Outlines" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="annotation" refreshOnNotifyMessage="">
+  <main-annotation-layer autoRefreshTime="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" type="annotation" legendPlaceholderImage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -559,7 +571,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" minScale="1e+08" maxScale="100000" refreshOnNotifyMessage="" styleCategories="AllStyleCategories">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08" maxScale="100000" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" type="raster" legendPlaceholderImage="">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -624,7 +636,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -635,9 +647,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
-        <noDataList useSrcNoData="0" bandNo="2"/>
-        <noDataList useSrcNoData="0" bandNo="3"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList bandNo="2" useSrcNoData="0"/>
+        <noDataList bandNo="3" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -649,58 +661,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" fetchMode="0" enabled="0">
+      <temporal fetchMode="0" mode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" enabled="0" band="1" zscale="1" zoffset="0">
+      <elevation zoffset="0" symbology="Line" enabled="0" zscale="1" band="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="152,125,183,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="152,125,183,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -731,36 +743,36 @@
               <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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="152,125,183,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="152,125,183,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="152,125,183,255" k="color"/>
@@ -775,9 +787,9 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -786,27 +798,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" value="copy" type="QString"/>
-          <Option name="QFieldSync/cloud_action" value="no_action" type="QString"/>
-          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
-          <Option name="WMSBackgroundLayer" value="false" type="QString"/>
-          <Option name="WMSPublishDataSourceUrl" value="false" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="identify/format" value="Value" type="QString"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="false" type="QString" name="WMSBackgroundLayer"/>
+          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="Value" type="QString" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option name="name" value="" type="QString"/>
+          <Option value="" type="QString" name="name"/>
           <Option name="properties"/>
-          <Option name="type" value="collection" type="QString"/>
+          <Option value="collection" type="QString" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
+          <resampling maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.5" nodataColor="" greenBand="2" blueBand="3" type="multibandcolor" redBand="1" alphaBand="-1">
+        <rasterrenderer opacity="0.5" greenBand="2" alphaBand="-1" nodataColor="" redBand="1" type="multibandcolor" blueBand="3">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -817,14 +829,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
-        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeRed="255" invertColors="0" colorizeGreen="128" colorizeBlue="128" grayscaleMode="0" saturation="0"/>
+        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
+        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeGreen="128" colorizeRed="255" grayscaleMode="0" saturation="0" invertColors="0" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" minScale="1e+08" maxScale="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" type="raster" legendPlaceholderImage="">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -889,7 +901,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -900,7 +912,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -912,58 +924,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" fetchMode="0" enabled="0">
+      <temporal fetchMode="0" mode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" enabled="0" band="1" zscale="1" zoffset="0">
+      <elevation zoffset="0" symbology="Line" enabled="0" zscale="1" band="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="225,89,137,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="225,89,137,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -994,36 +1006,36 @@
               <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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="225,89,137,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -1038,9 +1050,9 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1049,27 +1061,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" value="no_action" type="QString"/>
-          <Option name="QFieldSync/cloud_action" value="no_action" type="QString"/>
-          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
-          <Option name="WMSBackgroundLayer" value="true" type="QString"/>
-          <Option name="WMSPublishDataSourceUrl" value="false" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="identify/format" value="Undefined" type="QString"/>
+          <Option value="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="true" type="QString" name="WMSBackgroundLayer"/>
+          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="Undefined" type="QString" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option name="name" value="" type="QString"/>
+          <Option value="" type="QString" name="name"/>
           <Option name="properties"/>
-          <Option name="type" value="collection" type="QString"/>
+          <Option value="collection" type="QString" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
+          <resampling maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.75" nodataColor="" band="1" type="singlebandcolordata" alphaBand="-1">
+        <rasterrenderer opacity="0.75" alphaBand="-1" nodataColor="" type="singlebandcolordata" band="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1080,14 +1092,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
-        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeRed="255" invertColors="0" colorizeGreen="128" colorizeBlue="128" grayscaleMode="0" saturation="0"/>
+        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
+        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeGreen="128" colorizeRed="255" grayscaleMode="0" saturation="0" invertColors="0" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1152,7 +1164,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1166,8 +1178,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" name="length_km" length="-1" subType="0" expression="$length * 100" comment="" type="6" precision="0"/>
-        <field typeName="double precision" name="length_m" length="-1" subType="0" expression="$length * 100 * 1000" comment="" type="6" precision="0"/>
+        <field expression="$length * 100" precision="0" length="-1" typeName="double precision" subType="0" name="length_km" comment="" type="6"/>
+        <field expression="$length * 100 * 1000" precision="0" length="-1" typeName="double precision" subType="0" name="length_m" comment="" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1180,58 +1192,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="RouteLen" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="RouteLen">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="229,182,54,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="229,182,54,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1262,36 +1274,36 @@
               <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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="229,182,54,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="164,130,39,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="229,182,54,255" k="color"/>
@@ -1306,44 +1318,44 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="229,182,54,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="164,130,39,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -1366,59 +1378,59 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" checkstate="0" symbol="0" description="Only show when active in Atlas" label="Active Routes" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
-            <rule filter="&quot;Source&quot; = '21KM'" checkstate="0" symbol="1" description="This should be disabled, since it's only for legends" label="21KM" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
-            <rule filter="&quot;Source&quot; = '10KM'" checkstate="0" symbol="2" description="This should be disabled, since it's only for legends" label="10KM" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
-            <rule filter="&quot;Source&quot; = '5KM'" checkstate="0" symbol="3" description="This should be disabled, since it's only for legends" label="5KM" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
-            <rule filter="&quot;Source&quot; = 'Trail'" checkstate="0" symbol="4" description="This should be disabled, since it's only for legends" label="Trail" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
+          <rule description="Only show when active in Atlas" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" symbol="0" checkstate="0" label="Active Routes" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '21KM'" symbol="1" checkstate="0" label="21KM" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '10KM'" symbol="2" checkstate="0" label="10KM" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '5KM'" symbol="3" checkstate="0" label="5KM" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = 'Trail'" symbol="4" checkstate="0" label="Trail" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" symbol="5" description="Only show when active in Atlas" label="Show by day" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule filter="&quot;Source&quot; = '21KM'" checkstate="0" symbol="6" description="This should be disabled, since it's only for legends" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule filter="&quot;Source&quot; = '10KM'" checkstate="0" symbol="7" description="This should be disabled, since it's only for legends" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule filter="&quot;Source&quot; = '5KM'" checkstate="0" symbol="8" description="This should be disabled, since it's only for legends" label="5KM" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
-            <rule filter="&quot;Source&quot; = 'Trail'" checkstate="0" symbol="9" description="This should be disabled, since it's only for legends" label="Trail" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <rule description="Only show when active in Atlas" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" symbol="5" label="Show by day" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '21KM'" symbol="6" checkstate="0" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '10KM'" symbol="7" checkstate="0" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '5KM'" symbol="8" checkstate="0" label="5KM" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = 'Trail'" symbol="9" checkstate="0" label="Trail" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
           </rule>
-          <rule checkstate="0" symbol="10" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0" symbol="11" label="Always show by day" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule symbol="10" checkstate="0" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="11" checkstate="0" label="Always show by day" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1438,44 +1450,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@0@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
@@ -1491,32 +1503,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@0@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@0@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,0,0,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,0,0,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -1531,15 +1543,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1547,35 +1559,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1606,36 +1618,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1655,40 +1667,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@0@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@0@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -1711,38 +1723,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option 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" type="QString"/>
-                          <Option name="type" value="3" type="int"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                          <Option value="3" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1762,40 +1774,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@0@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@0@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -1818,47 +1830,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option 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" type="QString"/>
-                          <Option name="type" value="3" type="int"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                          <Option value="3" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1878,44 +1890,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -1931,32 +1943,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@1@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@1@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="210,32,39,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="210,32,39,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -1971,15 +1983,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1987,35 +1999,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="210,32,39,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="210,32,39,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2046,36 +2058,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2095,40 +2107,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2151,38 +2163,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2202,40 +2214,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2258,58 +2270,58 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="10" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="10" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2340,56 +2352,56 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="11" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="11" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.46" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.46" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2420,45 +2432,45 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="2" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2478,44 +2490,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@2@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@2@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -2531,32 +2543,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@2@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@2@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="103,34,144,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -2571,15 +2583,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2587,35 +2599,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="103,34,144,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2646,36 +2658,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2695,40 +2707,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@2@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@2@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2751,38 +2763,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2802,40 +2814,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@2@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@2@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2858,47 +2870,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="3" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2918,44 +2930,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@3@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@3@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="145,211,55,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
@@ -2971,32 +2983,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@3@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@3@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="145,211,55,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="145,211,55,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
@@ -3011,15 +3023,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3027,35 +3039,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="145,211,55,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,211,55,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3086,36 +3098,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3135,40 +3147,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@3@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@3@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="145,211,55,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3191,38 +3203,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3242,40 +3254,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@3@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@3@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="145,211,55,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3298,47 +3310,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="4" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3358,44 +3370,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@4@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@4@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="0,72,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="0,72,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,72,255,255" k="color"/>
@@ -3411,32 +3423,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@4@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@4@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,72,255,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,72,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,72,255,255" k="color"/>
@@ -3451,15 +3463,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3467,35 +3479,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="0,72,255,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,72,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3526,36 +3538,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3575,40 +3587,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@4@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@4@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,72,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,72,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3631,38 +3643,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3682,40 +3694,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@4@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@4@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,72,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,72,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3738,47 +3750,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="5" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="5" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3798,44 +3810,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@5@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@5@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
@@ -3851,32 +3863,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@5@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@5@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,0,0,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,0,0,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -3891,15 +3903,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3907,35 +3919,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3966,36 +3978,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4015,40 +4027,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@5@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@5@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4071,38 +4083,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option 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" type="QString"/>
-                          <Option name="type" value="3" type="int"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                          <Option value="3" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4122,40 +4134,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@5@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@5@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4178,47 +4190,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option 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" type="QString"/>
-                          <Option name="type" value="3" type="int"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                          <Option value="3" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="6" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="6" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4238,44 +4250,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@6@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@6@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -4291,32 +4303,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@6@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@6@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="210,32,39,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="210,32,39,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -4331,15 +4343,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4347,35 +4359,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="210,32,39,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="210,32,39,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -4406,36 +4418,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4455,40 +4467,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@6@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@6@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4511,38 +4523,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4562,40 +4574,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@6@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@6@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4618,47 +4630,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="7" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="7" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4678,44 +4690,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@7@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@7@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -4731,32 +4743,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@7@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@7@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="103,34,144,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -4771,15 +4783,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4787,35 +4799,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="103,34,144,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -4846,36 +4858,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4895,40 +4907,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@7@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@7@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4951,38 +4963,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5002,40 +5014,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@7@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@7@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5058,47 +5070,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="8" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="8" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5118,44 +5130,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@8@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@8@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="145,211,55,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
@@ -5171,32 +5183,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@8@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@8@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="145,211,55,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="145,211,55,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
@@ -5211,15 +5223,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5227,35 +5239,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="145,211,55,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,211,55,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -5286,36 +5298,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5335,40 +5347,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@8@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@8@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="145,211,55,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5391,38 +5403,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5442,40 +5454,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@8@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@8@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="145,211,55,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5498,47 +5510,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="9" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="9" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5558,44 +5570,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@9@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@9@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="0,72,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="0,72,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,72,255,255" k="color"/>
@@ -5611,32 +5623,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@9@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@9@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,72,255,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,72,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,72,255,255" k="color"/>
@@ -5651,15 +5663,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5667,35 +5679,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="0,72,255,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,72,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -5726,36 +5738,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5775,40 +5787,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@9@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@9@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,72,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,72,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5831,38 +5843,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5882,40 +5894,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@9@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@9@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,72,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,72,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5938,15 +5950,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -5960,42 +5972,42 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{48fee05e-0ef3-420c-825c-567446ab3f47}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" description="Active routes" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}">
+          <rule description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}">
             <settings calloutType="simple">
-              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="round($length / 1000, 0)" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="round($length / 1000, 0)" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="164,113,88,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="164,113,88,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -6018,34 +6030,34 @@
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,0,0,255" type="QString"/>
-                        <Option name="joinstyle" value="round" 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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="1" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,0,0,255" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -6060,98 +6072,98 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                            <Option type="Map" name="outlineColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="10" geometryGeneratorEnabled="1" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="km_marker()" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="0" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="3" offsetUnits="MapUnit" placementFlags="10" layerType="LineGeometry" geometryGenerator="km_marker()" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <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="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="field" value="quadrant" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="quadrant" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="field" value="rotation" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="rotation" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -6160,10 +6172,10 @@
       </labeling>
       <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="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
@@ -6172,56 +6184,56 @@
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -6252,9 +6264,9 @@
                 <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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6262,12 +6274,12 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -6278,199 +6290,199 @@
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="None">
+        <field configurationFlags="None" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="None">
+        <field configurationFlags="None" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="None">
+        <field configurationFlags="None" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Sort" configurationFlags="None">
+        <field configurationFlags="None" name="Sort">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="length_km" configurationFlags="None">
+        <field configurationFlags="None" name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="descriptio"/>
+        <alias index="2" name="" field="timestamp"/>
+        <alias index="3" name="" field="begin"/>
+        <alias index="4" name="" field="end"/>
+        <alias index="5" name="" field="Distance"/>
+        <alias index="6" name="" field="RouteLen"/>
+        <alias index="7" name="" field="Source"/>
+        <alias index="8" name="" field="Sort"/>
+        <alias index="9" name="" field="day"/>
+        <alias index="10" name="" field="length_km"/>
+        <alias index="11" name="" field="length_m"/>
       </aliases>
       <defaults>
-        <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="Distance" applyOnUpdate="0" expression=""/>
-        <default field="RouteLen" applyOnUpdate="0" expression=""/>
-        <default field="Source" applyOnUpdate="0" expression=""/>
-        <default field="Sort" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="length_km" applyOnUpdate="0" expression=""/>
-        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="descriptio"/>
+        <default expression="" applyOnUpdate="0" field="timestamp"/>
+        <default expression="" applyOnUpdate="0" field="begin"/>
+        <default expression="" applyOnUpdate="0" field="end"/>
+        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default expression="" applyOnUpdate="0" field="RouteLen"/>
+        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default expression="" applyOnUpdate="0" field="Sort"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="length_km"/>
+        <default expression="" applyOnUpdate="0" field="length_m"/>
       </defaults>
       <constraints>
-        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="descriptio" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="timestamp" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="begin" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="end" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="RouteLen" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Source" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Sort" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="length_km" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="length_m" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descriptio"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="timestamp"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="begin"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="end"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Distance"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Source"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Sort"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length_km"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length_m"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="Sort" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
+        <constraint desc="" exp="" field="Name"/>
+        <constraint desc="" exp="" field="descriptio"/>
+        <constraint desc="" exp="" field="timestamp"/>
+        <constraint desc="" exp="" field="begin"/>
+        <constraint desc="" exp="" field="end"/>
+        <constraint desc="" exp="" field="Distance"/>
+        <constraint desc="" exp="" field="RouteLen"/>
+        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" exp="" field="Sort"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="length_km"/>
+        <constraint desc="" exp="" field="length_m"/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" name="length_km" length="-1" subType="0" expression="$length * 100" comment="" type="6" precision="0"/>
-        <field typeName="double precision" name="length_m" length="-1" subType="0" expression="$length * 100 * 1000" comment="" type="6" precision="0"/>
+        <field expression="$length * 100" precision="0" length="-1" typeName="double precision" subType="0" name="length_km" comment="" type="6"/>
+        <field expression="$length * 100 * 1000" precision="0" length="-1" typeName="double precision" subType="0" name="length_m" comment="" type="6"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;length_m&quot;" actionWidgetStyle="dropDown" sortOrder="1">
+      <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;length_m&quot;">
         <columns>
-          <column width="152" hidden="0" name="Name" type="field"/>
-          <column width="-1" hidden="0" name="descriptio" type="field"/>
-          <column width="-1" hidden="0" name="timestamp" type="field"/>
-          <column width="163" hidden="0" name="begin" type="field"/>
-          <column width="-1" hidden="0" name="end" type="field"/>
-          <column width="-1" hidden="0" name="Distance" type="field"/>
+          <column width="152" hidden="0" type="field" name="Name"/>
+          <column width="-1" hidden="0" type="field" name="descriptio"/>
+          <column width="-1" hidden="0" type="field" name="timestamp"/>
+          <column width="163" hidden="0" type="field" name="begin"/>
+          <column width="-1" hidden="0" type="field" name="end"/>
+          <column width="-1" hidden="0" type="field" name="Distance"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="RouteLen" type="field"/>
-          <column width="-1" hidden="0" name="Source" type="field"/>
-          <column width="188" hidden="0" name="length_m" type="field"/>
-          <column width="-1" hidden="0" name="Sort" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="266" hidden="0" name="length_km" type="field"/>
+          <column width="-1" hidden="0" type="field" name="RouteLen"/>
+          <column width="-1" hidden="0" type="field" name="Source"/>
+          <column width="188" hidden="0" type="field" name="length_m"/>
+          <column width="-1" hidden="0" type="field" name="Sort"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="266" hidden="0" type="field" name="length_km"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6516,39 +6528,39 @@ def my_form_open(dialog, layer, feature):
         <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="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></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6621,58 +6633,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="196,60,57,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="196,60,57,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -6703,36 +6715,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="196,60,57,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="140,43,41,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="196,60,57,255" k="color"/>
@@ -6747,44 +6759,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="196,60,57,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="140,43,41,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -6807,54 +6819,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="183,72,75,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="183,72,75,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -6885,9 +6897,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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6898,9 +6910,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -6913,21 +6925,21 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="ID" configurationFlags="None">
+        <field configurationFlags="None" name="ID">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="height" configurationFlags="None">
+        <field configurationFlags="None" name="height">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="elevation" configurationFlags="None">
+        <field configurationFlags="None" name="elevation">
           <editWidget type="">
             <config>
               <Option/>
@@ -6936,30 +6948,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias index="0" name="" field="ID"/>
+        <alias index="1" name="" field="height"/>
+        <alias index="2" name="" field="elevation"/>
       </aliases>
       <defaults>
-        <default field="ID" applyOnUpdate="0" expression=""/>
-        <default field="height" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="ID"/>
+        <default expression="" applyOnUpdate="0" field="height"/>
+        <default expression="" applyOnUpdate="0" field="elevation"/>
       </defaults>
       <constraints>
-        <constraint field="ID" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="height" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="elevation" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ID"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="height"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" desc="" exp=""/>
-        <constraint field="height" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
+        <constraint desc="" exp="" field="ID"/>
+        <constraint desc="" exp="" field="height"/>
+        <constraint desc="" exp="" field="elevation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6982,7 +6994,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="Polygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -7057,58 +7069,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="133,182,111,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="133,182,111,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7139,36 +7151,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="133,182,111,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="95,130,79,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="133,182,111,255" k="color"/>
@@ -7183,44 +7195,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="133,182,111,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="95,130,79,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -7243,38 +7255,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="225,89,137,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -7289,9 +7301,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7302,9 +7314,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" value="no_action" type="QString"/>
-          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
-          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option value="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -7319,28 +7331,28 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="page" configurationFlags="None">
+        <field configurationFlags="None" name="page">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
@@ -7349,34 +7361,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="page"/>
+        <alias index="3" name="" field="day"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="page" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="page"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="page" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="page"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="page" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="page"/>
+        <constraint desc="" exp="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7399,7 +7411,574 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="Polygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
+      <extent>
+        <xmin>18.37673321782479974</xmin>
+        <ymin>-33.94582464707783487</ymin>
+        <xmax>18.42000208179202403</xmax>
+        <ymax>-33.89964429152626479</ymax>
+      </extent>
+      <wgs84extent>
+        <xmin>18.37673321782479974</xmin>
+        <ymin>-33.94582464707783487</ymin>
+        <xmax>18.42000208179202403</xmax>
+        <ymax>-33.89964429152626479</ymax>
+      </wgs84extent>
+      <id>cone_only_groups_5655c566_c302_4743_a580_b3593f83c018</id>
+      <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'fenc%25'%20GROUP%20BY%20%22group%22</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>cone_only_groups</layername>
+      <srs>
+        <spatialrefsys nativeFormat="Wkt">
+          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+          <srsid>3452</srsid>
+          <srid>4326</srid>
+          <authid>EPSG:4326</authid>
+          <description>WGS 84</description>
+          <projectionacronym>longlat</projectionacronym>
+          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type></type>
+        <title></title>
+        <abstract></abstract>
+        <links/>
+        <fees></fees>
+        <encoding></encoding>
+        <crs>
+          <spatialrefsys nativeFormat="Wkt">
+            <wkt></wkt>
+            <proj4></proj4>
+            <srsid>0</srsid>
+            <srid>0</srid>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
+            <geographicflag>false</geographicflag>
+          </spatialrefsys>
+        </crs>
+        <extent/>
+      </resourceMetadata>
+      <provider encoding="">virtual</provider>
+      <vectorjoins/>
+      <layerDependencies>
+        <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      </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 startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
+        <data-defined-properties>
+          <Option type="Map">
+            <Option value="" type="QString" name="name"/>
+            <Option name="properties"/>
+            <Option value="collection" type="QString" name="type"/>
+          </Option>
+        </data-defined-properties>
+        <profileLineSymbol>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="243,166,178,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+              </Option>
+              <prop v="0" k="align_dash_pattern"/>
+              <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"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="dash_pattern_offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+              <prop v="MM" k="dash_pattern_offset_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="243,166,178,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.6" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="trim_distance_end"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_end_unit"/>
+              <prop v="0" k="trim_distance_start"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_start_unit"/>
+              <prop v="0" k="tweak_dash_pattern_on_corners"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileLineSymbol>
+        <profileFillSymbol>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="243,166,178,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="174,119,127,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
+              </Option>
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="243,166,178,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="174,119,127,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileFillSymbol>
+        <profileMarkerSymbol>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="243,166,178,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="174,119,127,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
+              </Option>
+              <prop v="0" k="angle"/>
+              <prop v="square" k="cap_style"/>
+              <prop v="243,166,178,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="diamond" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="174,119,127,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileMarkerSymbol>
+      </elevation>
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+        <symbols>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="0" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="38,162,105,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="f_diagonal" type="QString" name="style"/>
+              </Option>
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="114,155,111,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="38,162,105,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="f_diagonal" k="style"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </symbols>
+        <rotation/>
+        <sizescale/>
+      </renderer-v2>
+      <customproperties>
+        <Option type="Map">
+          <Option type="List" name="dualview/previewExpressions">
+            <Option value="&quot;name&quot;" type="QString"/>
+          </Option>
+          <Option value="0" type="int" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
+        </Option>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="1" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="5" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="0" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" bold="0" underline="0" style="0" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
+          <axisSymbol>
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                </Option>
+                <prop v="0" k="align_dash_pattern"/>
+                <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"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="dash_pattern_offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+                <prop v="MM" k="dash_pattern_offset_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="35,35,35,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0.26" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="trim_distance_end"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_end_unit"/>
+                <prop v="0" k="trim_distance_start"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_start_unit"/>
+                <prop v="0" k="tweak_dash_pattern_on_corners"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </axisSymbol>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="1" linePlacementFlags="18" showAll="1" priority="0">
+        <properties>
+          <Option type="Map">
+            <Option value="" type="QString" name="name"/>
+            <Option name="properties"/>
+            <Option value="collection" type="QString" name="type"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+        <activeChecks/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option value="0" type="double" name="allowedGapsBuffer"/>
+            <Option value="false" type="bool" name="allowedGapsEnabled"/>
+            <Option value="" type="QString" name="allowedGapsLayer"/>
+          </Option>
+        </checkConfiguration>
+      </geometryOptions>
+      <legend showLabelLegend="0" type="default-vector"/>
+      <referencedLayers/>
+      <fieldConfiguration>
+        <field configurationFlags="None" name="name">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="group">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="type">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="day">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="cone_len">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias index="0" name="" field="name"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="day"/>
+        <alias index="4" name="" field="cone_len"/>
+      </aliases>
+      <defaults>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="cone_len"/>
+      </defaults>
+      <constraints>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="group"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cone_len"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="cone_len"/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+      </attributeactions>
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+        <columns>
+          <column width="306" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="group"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="-1" hidden="0" type="field" name="cone_len"/>
+          <column width="-1" hidden="1" type="actions"/>
+        </columns>
+      </attributetableconfig>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <storedexpressions/>
+      <editform tolerant="1"></editform>
+      <editforminit/>
+      <editforminitcodesource>0</editforminitcodesource>
+      <editforminitfilepath></editforminitfilepath>
+      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+"""
+QGIS forms can have a Python function that is called when the form is
+opened.
+
+Use this function to add extra logic to your forms.
+
+Enter the name of the function in the "Python Init function"
+field.
+An example follows:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+    geom = feature.geometry()
+    control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
+      <featformsuppress>0</featformsuppress>
+      <editorlayout>generatedlayout</editorlayout>
+      <editable>
+        <field editable="1" name="cone_len"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
+      </editable>
+      <labelOnTop>
+        <field 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 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></mapTip>
+    </maplayer>
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -7464,7 +8043,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7489,58 +8068,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="190,178,151,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="190,178,151,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7571,36 +8150,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="190,178,151,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="136,127,108,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,178,151,255" k="color"/>
@@ -7615,44 +8194,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="190,178,151,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="136,127,108,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -7675,54 +8254,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="0,85,255,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="1" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,85,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7753,9 +8332,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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7766,32 +8345,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="Name" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="63" fieldName="Name" textOpacity="1" isExpression="0" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -7806,116 +8385,116 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-          <placement priority="5" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="LineGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+          <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="0" xOffset="0" offsetType="0" placement="2" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="PreventOverlap" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="LineGeometry"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-              <Option name="blendMode" value="0" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" value="" type="QString"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" value="false" type="bool"/>
-              <Option name="enabled" value="0" type="QString"/>
-              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-              <Option name="minLength" value="0" type="double"/>
-              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="minLengthUnit" value="MM" type="QString"/>
-              <Option name="offsetFromAnchor" value="0" type="double"/>
-              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-              <Option name="offsetFromLabel" value="0" type="double"/>
-              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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" value="Name" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="Name" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -7946,9 +8525,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7956,12 +8535,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -7972,14 +8551,14 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -7988,29 +8567,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="Name"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Name"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="Name" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="Name"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="Name"/>
           <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
@@ -8047,8 +8626,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="id"/>
       </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/>
@@ -8056,7 +8635,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8121,7 +8700,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8146,58 +8725,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="145,82,45,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,82,45,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -8228,36 +8807,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="145,82,45,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="104,59,32,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="145,82,45,255" k="color"/>
@@ -8272,44 +8851,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="145,82,45,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="104,59,32,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -8332,48 +8911,48 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule filter="&quot;distance&quot; = '21KM'" symbol="0" description="Only show when active in Atlas" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule filter="&quot;distance&quot; = '10KM'" symbol="1" description="Only show when active in Atlas" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule filter="&quot;distance&quot; = '5KM'" symbol="2" description="Only show when active in Atlas" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '21KM'" symbol="0" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '10KM'" symbol="1" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '5KM'" symbol="2" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8393,40 +8972,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@0@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="miter" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="210,32,39,255" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0.5" 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="area" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="miter" type="QString" name="joinstyle"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="210,32,39,255" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0.5" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="area" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -8449,32 +9028,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="250" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MapUnit" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="100" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="100" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8494,44 +9073,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@0@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@0@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" 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 value="0" type="QString" name="angle"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -8547,32 +9126,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@0@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@0@1@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="210,32,39,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="26,0,201,0" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="210,32,39,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -8587,9 +9166,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8597,35 +9176,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="flat" 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="MapUnit" 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="miter" type="QString"/>
-                <Option name="line_color" value="210,32,39,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.75" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="210,32,39,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -8656,39 +9235,39 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8708,44 +9287,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="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 value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -8761,32 +9340,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@1@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@1@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="103,34,144,255" type="QString"/>
-                        <Option name="joinstyle" value="miter" 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="103,34,144,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.5" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="103,34,144,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.5" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -8801,9 +9380,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8811,24 +9390,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="250" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="100" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="100" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8848,44 +9427,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="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 value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -8901,32 +9480,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@1@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@1@1@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="103,34,144,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="26,0,201,0" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -8941,9 +9520,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8951,35 +9530,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="flat" 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="miter" type="QString"/>
-                <Option name="line_color" value="103,34,144,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.75" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -9010,39 +9589,39 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="2" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MapUnit" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9062,44 +9641,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@2@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@2@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="69,100,25,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" 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 value="0" type="QString" name="angle"/>
+                    <Option value="69,100,25,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
@@ -9115,32 +9694,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@2@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@2@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="69,100,25,255" type="QString"/>
-                        <Option name="joinstyle" value="miter" 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="69,100,25,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.5" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="69,100,25,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="69,100,25,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.5" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
@@ -9155,9 +9734,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9165,24 +9744,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="250" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MapUnit" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="100" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="100" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9202,44 +9781,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@2@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@2@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="69,100,25,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" 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 value="0" type="QString" name="angle"/>
+                    <Option value="69,100,25,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
@@ -9255,32 +9834,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@2@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@2@1@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="69,100,25,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="26,0,201,0" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="69,100,25,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
@@ -9295,9 +9874,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9305,35 +9884,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="flat" 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="MapUnit" 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="miter" type="QString"/>
-                <Option name="line_color" value="69,100,25,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.75" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="69,100,25,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -9364,9 +9943,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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9378,60 +9957,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -9462,9 +10041,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9472,12 +10051,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -9488,49 +10067,49 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="Distance"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="Distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="Distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column width="-1" hidden="0" name="Distance" type="field"/>
+          <column width="-1" hidden="0" type="field" name="Distance"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9575,17 +10154,17 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="timestamp"/>
       </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/>
@@ -9593,7 +10172,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -9666,58 +10245,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="125,139,143,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="125,139,143,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -9748,36 +10327,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="125,139,143,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="89,99,102,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="125,139,143,255" k="color"/>
@@ -9792,44 +10371,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="125,139,143,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="89,99,102,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -9852,46 +10431,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="0.796078" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="0.796078" type="marker" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="227,0,185,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0" 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="1" 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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="227,0,185,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="1" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -9914,15 +10493,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9933,34 +10512,34 @@ 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" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="position" textOpacity="1" isExpression="0" namedStyle="Semibold" fontSize="8" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeY="0.20000000000000001">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.4" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -9975,151 +10554,151 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="FontStyle">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="ObstacleFactor">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="Priority" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="Priority">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="Size">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="ZIndex" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="ZIndex">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="8" geometryGeneratorEnabled="0" placement="1" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="8" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="1" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="Priority">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="Size">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="4" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="227,0,185,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="position" textOpacity="0.90000000000000002" isExpression="0" namedStyle="Semibold" fontSize="4" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="227,0,185,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.5" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.1" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -10134,89 +10713,89 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="FontStyle">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="Size">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="2" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="1" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="0" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="2" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="Size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -10225,194 +10804,194 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
-          <Option name="labeling/angleOffset" value="0" type="QString"/>
-          <Option name="labeling/blendMode" value="0" type="QString"/>
-          <Option name="labeling/bufferBlendMode" value="0" type="QString"/>
-          <Option name="labeling/bufferColorA" value="255" type="QString"/>
-          <Option name="labeling/bufferColorB" value="255" type="QString"/>
-          <Option name="labeling/bufferColorG" value="255" type="QString"/>
-          <Option name="labeling/bufferColorR" value="255" type="QString"/>
-          <Option name="labeling/bufferDraw" value="false" type="QString"/>
-          <Option name="labeling/bufferJoinStyle" value="64" type="QString"/>
-          <Option name="labeling/bufferNoFill" value="false" type="QString"/>
-          <Option name="labeling/bufferSize" value="1" type="QString"/>
-          <Option name="labeling/bufferSizeInMapUnits" value="false" type="QString"/>
-          <Option name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/bufferTransp" value="0" type="QString"/>
-          <Option name="labeling/centroidInside" value="false" type="QString"/>
-          <Option name="labeling/centroidWhole" value="false" type="QString"/>
-          <Option name="labeling/decimals" value="3" type="QString"/>
-          <Option name="labeling/displayAll" value="false" type="QString"/>
-          <Option name="labeling/dist" value="0" type="QString"/>
-          <Option name="labeling/distInMapUnits" value="false" type="QString"/>
-          <Option name="labeling/distMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/drawLabels" value="false" type="QString"/>
-          <Option name="labeling/enabled" value="false" type="QString"/>
-          <Option name="labeling/fieldName" value="position" type="QString"/>
-          <Option name="labeling/fitInPolygonOnly" value="false" type="QString"/>
-          <Option name="labeling/fontCapitals" value="0" type="QString"/>
-          <Option name="labeling/fontFamily" value="Myriad Pro" type="QString"/>
-          <Option name="labeling/fontItalic" value="false" type="QString"/>
-          <Option name="labeling/fontLetterSpacing" value="0" type="QString"/>
-          <Option name="labeling/fontLimitPixelSize" value="false" type="QString"/>
-          <Option name="labeling/fontMaxPixelSize" value="10000" type="QString"/>
-          <Option name="labeling/fontMinPixelSize" value="3" type="QString"/>
-          <Option name="labeling/fontSize" value="10" type="QString"/>
-          <Option name="labeling/fontSizeInMapUnits" value="false" type="QString"/>
-          <Option name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/fontStrikeout" value="false" type="QString"/>
-          <Option name="labeling/fontUnderline" value="false" type="QString"/>
-          <Option name="labeling/fontWeight" value="63" type="QString"/>
-          <Option name="labeling/fontWordSpacing" value="0" type="QString"/>
-          <Option name="labeling/formatNumbers" value="false" type="QString"/>
-          <Option name="labeling/isExpression" value="false" type="QString"/>
-          <Option name="labeling/labelOffsetInMapUnits" value="true" type="QString"/>
-          <Option name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/labelPerPart" value="false" type="QString"/>
-          <Option name="labeling/leftDirectionSymbol" value="&lt;" type="QString"/>
-          <Option name="labeling/limitNumLabels" value="false" type="QString"/>
-          <Option name="labeling/maxCurvedCharAngleIn" value="20" type="QString"/>
-          <Option name="labeling/maxCurvedCharAngleOut" value="-20" type="QString"/>
-          <Option name="labeling/maxNumLabels" value="2000" type="QString"/>
-          <Option name="labeling/mergeLines" value="false" type="QString"/>
-          <Option name="labeling/minFeatureSize" value="0" type="QString"/>
-          <Option name="labeling/multilineAlign" value="0" type="QString"/>
-          <Option name="labeling/multilineHeight" value="1" type="QString"/>
-          <Option name="labeling/namedStyle" value="Semibold" type="QString"/>
-          <Option name="labeling/obstacle" value="true" type="QString"/>
-          <Option name="labeling/obstacleFactor" value="1" type="QString"/>
-          <Option name="labeling/obstacleType" value="0" type="QString"/>
-          <Option name="labeling/offsetType" value="0" type="QString"/>
-          <Option name="labeling/placeDirectionSymbol" value="0" type="QString"/>
-          <Option name="labeling/placement" value="0" type="QString"/>
-          <Option name="labeling/placementFlags" value="10" type="QString"/>
-          <Option name="labeling/plussign" value="false" type="QString"/>
-          <Option name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString"/>
-          <Option name="labeling/preserveRotation" value="true" type="QString"/>
-          <Option name="labeling/previewBkgrdColor" value="#ffffff" type="QString"/>
-          <Option name="labeling/priority" value="5" type="QString"/>
-          <Option name="labeling/quadOffset" value="4" type="QString"/>
-          <Option name="labeling/repeatDistance" value="0" type="QString"/>
-          <Option name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/repeatDistanceUnit" value="1" type="QString"/>
-          <Option name="labeling/reverseDirectionSymbol" value="false" type="QString"/>
-          <Option name="labeling/rightDirectionSymbol" value=">" type="QString"/>
-          <Option name="labeling/scaleMax" value="10000000" type="QString"/>
-          <Option name="labeling/scaleMin" value="1" type="QString"/>
-          <Option name="labeling/scaleVisibility" value="false" type="QString"/>
-          <Option name="labeling/shadowBlendMode" value="6" type="QString"/>
-          <Option name="labeling/shadowColorB" value="0" type="QString"/>
-          <Option name="labeling/shadowColorG" value="0" type="QString"/>
-          <Option name="labeling/shadowColorR" value="0" type="QString"/>
-          <Option name="labeling/shadowDraw" value="false" type="QString"/>
-          <Option name="labeling/shadowOffsetAngle" value="135" type="QString"/>
-          <Option name="labeling/shadowOffsetDist" value="1" type="QString"/>
-          <Option name="labeling/shadowOffsetGlobal" value="true" type="QString"/>
-          <Option name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shadowOffsetUnits" value="1" type="QString"/>
-          <Option name="labeling/shadowRadius" value="1.5" type="QString"/>
-          <Option name="labeling/shadowRadiusAlphaOnly" value="false" type="QString"/>
-          <Option name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shadowRadiusUnits" value="1" type="QString"/>
-          <Option name="labeling/shadowScale" value="100" type="QString"/>
-          <Option name="labeling/shadowTransparency" value="30" type="QString"/>
-          <Option name="labeling/shadowUnder" value="0" type="QString"/>
-          <Option name="labeling/shapeBlendMode" value="0" type="QString"/>
-          <Option name="labeling/shapeBorderColorA" value="255" type="QString"/>
-          <Option name="labeling/shapeBorderColorB" value="128" type="QString"/>
-          <Option name="labeling/shapeBorderColorG" value="128" type="QString"/>
-          <Option name="labeling/shapeBorderColorR" value="128" type="QString"/>
-          <Option name="labeling/shapeBorderWidth" value="0" type="QString"/>
-          <Option name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeBorderWidthUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeDraw" value="true" type="QString"/>
-          <Option name="labeling/shapeFillColorA" value="255" type="QString"/>
-          <Option name="labeling/shapeFillColorB" value="138" type="QString"/>
-          <Option name="labeling/shapeFillColorG" value="0" type="QString"/>
-          <Option name="labeling/shapeFillColorR" value="101" type="QString"/>
-          <Option name="labeling/shapeJoinStyle" value="64" type="QString"/>
-          <Option name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeOffsetUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeOffsetX" value="0" type="QString"/>
-          <Option name="labeling/shapeOffsetY" value="0" type="QString"/>
-          <Option name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeRadiiUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeRadiiX" value="0" type="QString"/>
-          <Option name="labeling/shapeRadiiY" value="0" type="QString"/>
-          <Option name="labeling/shapeRotation" value="0" type="QString"/>
-          <Option name="labeling/shapeRotationType" value="0" type="QString"/>
-          <Option name="labeling/shapeSVGFile" value="" type="QString"/>
-          <Option name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeSizeType" value="0" type="QString"/>
-          <Option name="labeling/shapeSizeUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeSizeX" value="0" type="QString"/>
-          <Option name="labeling/shapeSizeY" value="0" type="QString"/>
-          <Option name="labeling/shapeTransparency" value="0" type="QString"/>
-          <Option name="labeling/shapeType" value="0" type="QString"/>
-          <Option name="labeling/textColorA" value="255" type="QString"/>
-          <Option name="labeling/textColorB" value="255" type="QString"/>
-          <Option name="labeling/textColorG" value="255" type="QString"/>
-          <Option name="labeling/textColorR" value="255" type="QString"/>
-          <Option name="labeling/textTransp" value="0" type="QString"/>
-          <Option name="labeling/upsidedownLabels" value="0" type="QString"/>
-          <Option name="labeling/wrapChar" value="" type="QString"/>
-          <Option name="labeling/xOffset" value="0" type="QString"/>
-          <Option name="labeling/yOffset" value="0" type="QString"/>
-          <Option name="labeling/zIndex" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/angleOffset"/>
+          <Option value="0" type="QString" name="labeling/blendMode"/>
+          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
+          <Option value="255" type="QString" name="labeling/bufferColorA"/>
+          <Option value="255" type="QString" name="labeling/bufferColorB"/>
+          <Option value="255" type="QString" name="labeling/bufferColorG"/>
+          <Option value="255" type="QString" name="labeling/bufferColorR"/>
+          <Option value="false" type="QString" name="labeling/bufferDraw"/>
+          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
+          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
+          <Option value="1" type="QString" name="labeling/bufferSize"/>
+          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/bufferTransp"/>
+          <Option value="false" type="QString" name="labeling/centroidInside"/>
+          <Option value="false" type="QString" name="labeling/centroidWhole"/>
+          <Option value="3" type="QString" name="labeling/decimals"/>
+          <Option value="false" type="QString" name="labeling/displayAll"/>
+          <Option value="0" type="QString" name="labeling/dist"/>
+          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/drawLabels"/>
+          <Option value="false" type="QString" name="labeling/enabled"/>
+          <Option value="position" type="QString" name="labeling/fieldName"/>
+          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
+          <Option value="0" type="QString" name="labeling/fontCapitals"/>
+          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
+          <Option value="false" type="QString" name="labeling/fontItalic"/>
+          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
+          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
+          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
+          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
+          <Option value="10" type="QString" name="labeling/fontSize"/>
+          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
+          <Option value="false" type="QString" name="labeling/fontUnderline"/>
+          <Option value="63" type="QString" name="labeling/fontWeight"/>
+          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
+          <Option value="false" type="QString" name="labeling/formatNumbers"/>
+          <Option value="false" type="QString" name="labeling/isExpression"/>
+          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/labelPerPart"/>
+          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
+          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
+          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
+          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
+          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
+          <Option value="false" type="QString" name="labeling/mergeLines"/>
+          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
+          <Option value="0" type="QString" name="labeling/multilineAlign"/>
+          <Option value="1" type="QString" name="labeling/multilineHeight"/>
+          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
+          <Option value="true" type="QString" name="labeling/obstacle"/>
+          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
+          <Option value="0" type="QString" name="labeling/obstacleType"/>
+          <Option value="0" type="QString" name="labeling/offsetType"/>
+          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/placement"/>
+          <Option value="10" type="QString" name="labeling/placementFlags"/>
+          <Option value="false" type="QString" name="labeling/plussign"/>
+          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
+          <Option value="true" type="QString" name="labeling/preserveRotation"/>
+          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
+          <Option value="5" type="QString" name="labeling/priority"/>
+          <Option value="4" type="QString" name="labeling/quadOffset"/>
+          <Option value="0" type="QString" name="labeling/repeatDistance"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
+          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
+          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
+          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
+          <Option value="1" type="QString" name="labeling/scaleMin"/>
+          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
+          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
+          <Option value="0" type="QString" name="labeling/shadowColorB"/>
+          <Option value="0" type="QString" name="labeling/shadowColorG"/>
+          <Option value="0" type="QString" name="labeling/shadowColorR"/>
+          <Option value="false" type="QString" name="labeling/shadowDraw"/>
+          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
+          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
+          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
+          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
+          <Option value="100" type="QString" name="labeling/shadowScale"/>
+          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
+          <Option value="0" type="QString" name="labeling/shadowUnder"/>
+          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
+          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
+          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
+          <Option value="true" type="QString" name="labeling/shapeDraw"/>
+          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
+          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
+          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
+          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
+          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
+          <Option value="0" type="QString" name="labeling/shapeRotation"/>
+          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
+          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
+          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
+          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
+          <Option value="0" type="QString" name="labeling/shapeType"/>
+          <Option value="255" type="QString" name="labeling/textColorA"/>
+          <Option value="255" type="QString" name="labeling/textColorB"/>
+          <Option value="255" type="QString" name="labeling/textColorG"/>
+          <Option value="255" type="QString" name="labeling/textColorR"/>
+          <Option value="0" type="QString" name="labeling/textTransp"/>
+          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
+          <Option value="" type="QString" name="labeling/wrapChar"/>
+          <Option value="0" type="QString" name="labeling/xOffset"/>
+          <Option value="0" type="QString" name="labeling/yOffset"/>
+          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -10443,9 +11022,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10453,12 +11032,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="10" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="10" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10469,67 +11048,67 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="position"/>
+        <alias index="2" name="" field="type"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="position" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="position"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="position"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="position"/>
+        <constraint desc="" exp="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="position" type="field"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" type="field" name="position"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10605,7 +11184,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="Polygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -10623,7 +11202,7 @@ def my_form_open(dialog, layer, feature):
       <keywordList>
         <value></value>
       </keywordList>
-      <layername>fence_groups</layername>
+      <layername>fence_and_cone_groups</layername>
       <srs>
         <spatialrefsys nativeFormat="Wkt">
           <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -10644,6 +11223,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -10660,14 +11248,24 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="">virtual</provider>
       <vectorjoins/>
       <layerDependencies>
         <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       </layerDependencies>
-      <dataDependencies/>
+      <dataDependencies>
+        <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      </dataDependencies>
       <expressionfields/>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -10680,58 +11278,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="164,113,88,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="164,113,88,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -10762,36 +11360,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="164,113,88,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="117,81,63,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="164,113,88,255" k="color"/>
@@ -10806,44 +11404,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="164,113,88,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="117,81,63,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -10866,38 +11464,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="0,85,0,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="0,85,0,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="b_diagonal" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,85,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,85,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="b_diagonal" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,85,0,255" k="color"/>
@@ -10912,9 +11510,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10925,62 +11523,62 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" value="no_action" 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="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option name="variableNames"/>
+          <Option name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -11011,9 +11609,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11021,64 +11619,64 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="1" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="1" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" value="0" type="double"/>
-            <Option name="allowedGapsEnabled" value="false" type="bool"/>
-            <Option name="allowedGapsLayer" value="" type="QString"/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option value="0" type="double" name="allowedGapsBuffer"/>
+            <Option value="false" type="bool" name="allowedGapsEnabled"/>
+            <Option value="" type="QString" name="allowedGapsLayer"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="group" configurationFlags="None">
+        <field configurationFlags="None" name="group">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
-          <editWidget type="">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="cone_len" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="fence_len" configurationFlags="None">
+        <field configurationFlags="None" name="cone_len">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="fence_len">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -11087,50 +11685,50 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
-        <alias field="fence_len" index="5" name=""/>
+        <alias index="0" name="" field="name"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="day"/>
+        <alias index="4" name="" field="cone_len"/>
+        <alias index="5" name="" field="fence_len"/>
       </aliases>
       <defaults>
-        <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=""/>
-        <default field="fence_len" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="cone_len"/>
+        <default expression="" applyOnUpdate="0" field="fence_len"/>
       </defaults>
       <constraints>
-        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="group" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="cone_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="fence_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="group"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cone_len"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fence_len"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="group" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
-        <constraint field="fence_len" desc="" exp=""/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="cone_len"/>
+        <constraint desc="" exp="" field="fence_len"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="415" hidden="0" name="name" type="field"/>
-          <column width="-1" hidden="0" name="group" type="field"/>
+          <column width="415" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="group"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
-          <column width="-1" hidden="0" name="cone_len" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="-1" hidden="0" name="fence_len" type="field"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
+          <column width="-1" hidden="0" type="field" name="cone_len"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="-1" hidden="0" type="field" name="fence_len"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11163,31 +11761,34 @@ def my_form_open(dialog, layer, feature):
       <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"/>
       </editable>
       <labelOnTop>
-        <field name="cone_len" 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="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></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11252,7 +11853,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11266,26 +11867,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" type="6" precision="0"/>
-        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" type="6" precision="0"/>
-        <field typeName="double precision" name="cone_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" type="6" precision="0"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" length="-1" typeName="double precision" subType="0" name="fence_len" comment="" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" length="-1" typeName="double precision" subType="0" name="fence_len" comment="" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" length="-1" typeName="double precision" subType="0" name="cone_len" comment="" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyLocal="1" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyAlgorithm="0" version="3.8.3-Zanzibar" simplifyMaxScale="1" simplifyDrawingTol="1" readOnly="0" minScale="1e+08" maxScale="0" simplifyDrawingHints="1" styleCategories="AllStyleCategories">
+          <qgis styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" minScale="1e+08" readOnly="0" maxScale="0" simplifyAlgorithm="0" simplifyDrawingHints="1" labelsEnabled="1" simplifyDrawingTol="1" simplifyMaxScale="1" simplifyLocal="1" version="3.8.3-Zanzibar">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 symbollevels="1" enableorderby="0" type="RuleRenderer" forceraster="0">
+            <renderer-v2 symbollevels="1" forceraster="0" enableorderby="0" type="RuleRenderer">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
                 <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
               </rules>
               <symbols>
-                <symbol force_rhr="0" clip_to_extent="1" name="0" alpha="1" type="line">
-                  <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+                <symbol force_rhr="0" alpha="1" name="0" type="line" clip_to_extent="1">
+                  <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                     <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"/>
@@ -11304,9 +11905,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 value="" name="name" type="QString"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -11317,62 +11918,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style isExpression="0" fontCapitals="0" fontFamily="Myriad Pro" fieldName="comment" fontWeight="50" blendMode="0" fontLetterSpacing="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="#ffffff" fontSize="11" fontItalic="0" fontUnderline="0" textOpacity="0.8" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1">
-                      <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-                      <background shapeOffsetY="0" shapeSizeY="1" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeType="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="255,255,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeType="0" shapeOpacity="0.6" shapeJoinStyle="128" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetGlobal="1"/>
+                    <text-style fontWeight="50" fieldName="comment" textOpacity="0.8" isExpression="0" namedStyle="Regular" fontSize="11" fontCapitals="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontItalic="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="#ffffff" blendMode="0" fontLetterSpacing="0" fontWordSpacing="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
+                      <background shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.6" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeOpacity="0.6" shapeDraw="1" shapeType="0" shapeBlendMode="0" shapeJoinStyle="128" shapeSizeX="1" shapeRotationType="0" shapeSizeY="1"/>
+                      <shadow shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" autoWrapLength="0"/>
-                    <placement repeatDistanceUnits="MM" placementFlags="2" dist="5" rotationAngle="0" distUnits="MM" geometryGenerator="" offsetType="0" xOffset="0" offsetUnits="MM" preserveRotation="1" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="4" priority="5" repeatDistance="0" centroidWhole="0" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" geometryGeneratorType="PointGeometry" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0"/>
-                    <rendering maxNumLabels="2000" obstacleFactor="1" displayAll="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+                    <text-format decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="4294967295"/>
+                    <placement centroidWhole="0" geometryGenerator="" geometryGeneratorType="PointGeometry" repeatDistance="0" repeatDistanceUnits="MM" placementFlags="2" offsetType="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" centroidInside="0" preserveRotation="1" yOffset="0" geometryGeneratorEnabled="0" quadOffset="4" maxCurvedCharAngleOut="-25" priority="5" xOffset="0" dist="5" placement="4" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM"/>
+                    <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="1" obstacle="1" scaleMin="0" limitNumLabels="0" displayAll="1" obstacleType="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" name="name" 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 value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </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 value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
                         </Option>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
                 <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style isExpression="1" fontCapitals="0" fontFamily="Myriad Pro" fieldName="round( $length, 1) || 'm'" fontWeight="63" blendMode="0" fontLetterSpacing="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="#ffffff" fontSize="12" fontItalic="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1">
-                      <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-                      <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeType="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeOpacity="1" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetGlobal="1"/>
+                    <text-style fontWeight="63" fieldName="round( $length, 1) || 'm'" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="12" fontCapitals="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontItalic="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="#ffffff" blendMode="0" fontLetterSpacing="0" fontWordSpacing="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
+                      <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeOpacity="1" shapeDraw="0" shapeType="0" shapeBlendMode="0" shapeJoinStyle="64" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0"/>
+                      <shadow shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" autoWrapLength="0"/>
-                    <placement repeatDistanceUnits="MM" placementFlags="15" dist="1" rotationAngle="0" distUnits="MM" geometryGenerator="" offsetType="0" xOffset="0" offsetUnits="MM" preserveRotation="1" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" priority="5" repeatDistance="0" centroidWhole="0" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" geometryGeneratorType="PointGeometry" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0"/>
-                    <rendering maxNumLabels="2000" obstacleFactor="1" displayAll="0" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+                    <text-format decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="4294967295"/>
+                    <placement centroidWhole="0" geometryGenerator="" geometryGeneratorType="PointGeometry" repeatDistance="0" repeatDistanceUnits="MM" placementFlags="15" offsetType="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" centroidInside="0" preserveRotation="1" yOffset="0" geometryGeneratorEnabled="0" quadOffset="4" maxCurvedCharAngleOut="-25" priority="5" xOffset="0" dist="1" placement="2" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM"/>
+                    <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" displayAll="0" obstacleType="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" name="name" 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 value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </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 value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
                         </Option>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -11388,18 +11989,18 @@ def my_form_open(dialog, layer, feature):
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" height="15" minimumSize="0" lineSizeType="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" rotationOffset="270" backgroundColor="#ffffff" diagramOrientation="Up" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute field="" color="#000000" label=""/>
+            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+              <DiagramCategory scaleBasedVisibility="0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" rotationOffset="270" penColor="#000000" height="15" penWidth="0" minimumSize="0" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" opacity="1" backgroundColor="#ffffff" minScaleDenominator="0" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings showAll="1" priority="0" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+            <DiagramLayerSettings dist="0" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
               <properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
@@ -11487,68 +12088,68 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" index="0" name=""/>
-              <alias field="group" index="1" name=""/>
-              <alias field="comment" index="2" name=""/>
-              <alias field="moveable" index="3" name=""/>
-              <alias field="type" index="4" name=""/>
-              <alias field="name" index="5" name=""/>
-              <alias field="hidden" index="6" name=""/>
-              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-              <alias field="fence_len" index="9" name=""/>
-              <alias field="cone_len" index="10" name=""/>
+              <alias index="0" name="" field="id"/>
+              <alias index="1" name="" field="group"/>
+              <alias index="2" name="" field="comment"/>
+              <alias index="3" name="" field="moveable"/>
+              <alias index="4" name="" field="type"/>
+              <alias index="5" name="" field="name"/>
+              <alias index="6" name="" field="hidden"/>
+              <alias index="7" name="" field="auxiliary_storage_labeling_positiony"/>
+              <alias index="8" name="" field="auxiliary_storage_labeling_positionx"/>
+              <alias index="9" name="" field="fence_len"/>
+              <alias index="10" name="" field="cone_len"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <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=""/>
+              <default expression="" applyOnUpdate="0" field="id"/>
+              <default expression="" applyOnUpdate="0" field="group"/>
+              <default expression="" applyOnUpdate="0" field="comment"/>
+              <default expression="" applyOnUpdate="0" field="moveable"/>
+              <default expression="" applyOnUpdate="0" field="type"/>
+              <default expression="" applyOnUpdate="0" field="name"/>
+              <default expression="" applyOnUpdate="0" field="hidden"/>
+              <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positiony"/>
+              <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positionx"/>
+              <default expression="" applyOnUpdate="0" field="fence_len"/>
+              <default expression="" applyOnUpdate="0" field="cone_len"/>
             </defaults>
             <constraints>
-              <constraint field="id" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="group" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="comment" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="moveable" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="type" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="name" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="hidden" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="auxiliary_storage_labeling_positiony" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="auxiliary_storage_labeling_positionx" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="fence_len" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="cone_len" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="group"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="moveable"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hidden"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_positiony"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_positionx"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fence_len"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cone_len"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="id" desc="" exp=""/>
-              <constraint field="group" desc="" exp=""/>
-              <constraint field="comment" desc="" exp=""/>
-              <constraint field="moveable" desc="" exp=""/>
-              <constraint field="type" desc="" exp=""/>
-              <constraint field="name" desc="" exp=""/>
-              <constraint field="hidden" desc="" exp=""/>
-              <constraint field="auxiliary_storage_labeling_positiony" desc="" exp=""/>
-              <constraint field="auxiliary_storage_labeling_positionx" desc="" exp=""/>
-              <constraint field="fence_len" desc="" exp=""/>
-              <constraint field="cone_len" desc="" exp=""/>
+              <constraint desc="" exp="" field="id"/>
+              <constraint desc="" exp="" field="group"/>
+              <constraint desc="" exp="" field="comment"/>
+              <constraint desc="" exp="" field="moveable"/>
+              <constraint desc="" exp="" field="type"/>
+              <constraint desc="" exp="" field="name"/>
+              <constraint desc="" exp="" field="hidden"/>
+              <constraint desc="" exp="" field="auxiliary_storage_labeling_positiony"/>
+              <constraint desc="" exp="" field="auxiliary_storage_labeling_positionx"/>
+              <constraint desc="" exp="" field="fence_len"/>
+              <constraint desc="" exp="" field="cone_len"/>
             </constraintExpressions>
             <expressionfields>
-              <field typeName="double precision" name="fence_len" length="-1" subType="0" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" type="6" precision="0"/>
-              <field typeName="double precision" name="fence_len" length="-1" subType="0" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" type="6" precision="0"/>
-              <field typeName="double precision" name="cone_len" length="-1" subType="0" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" type="6" precision="0"/>
+              <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" typeName="double precision" length="-1" subType="0" name="fence_len" comment="" type="6"/>
+              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" typeName="double precision" length="-1" subType="0" name="fence_len" comment="" type="6"/>
+              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" typeName="double precision" length="-1" subType="0" name="cone_len" comment="" type="6"/>
             </expressionfields>
             <attributeactions>
               <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+            <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
               <columns>
                 <column width="-1" hidden="0" name="id" type="field"/>
                 <column width="-1" hidden="0" name="group" type="field"/>
@@ -11606,18 +12207,18 @@ def my_form_open(dialog, layer, feature):
               <field editable="1" name="type"/>
             </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>
@@ -11634,58 +12235,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="133,182,111,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="133,182,111,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -11716,36 +12317,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="133,182,111,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="95,130,79,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="133,182,111,255" k="color"/>
@@ -11760,44 +12361,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="133,182,111,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="95,130,79,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -11820,64 +12421,64 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="1" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
           <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
             <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="1" checkstate="0" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" checkstate="0" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
             <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
           </rule>
           <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="4" label="Is Visible" key="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
           <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="round" type="QString"/>
-                <Option name="customdash" value="1;4" type="QString"/>
-                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="customdash_unit" value="Point" 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="round" type="QString"/>
-                <Option name="line_color" value="255,255,0,255" type="QString"/>
-                <Option name="line_style" value="dot" type="QString"/>
-                <Option name="line_width" value="1" 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="1" type="QString"/>
-                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="round" type="QString" name="capstyle"/>
+                <Option value="1;4" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="Point" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="dot" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="round" k="capstyle"/>
@@ -11908,56 +12509,56 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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')" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="round" type="QString"/>
-                <Option name="customdash" value="4;3" 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="round" type="QString"/>
-                <Option name="line_color" value="255,255,0,255" type="QString"/>
-                <Option name="line_style" value="dash" type="QString"/>
-                <Option name="line_width" value="1" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="round" type="QString" name="capstyle"/>
+                <Option value="4;3" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="dash" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="round" k="capstyle"/>
@@ -11988,56 +12589,56 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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')" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="2" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="255,255,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.8" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.8" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12068,56 +12669,56 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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')" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="3" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="0,0,255,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.8" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.8" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12148,56 +12749,56 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="4" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="255,255,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12228,50 +12829,50 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="5" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="5" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="213,180,60,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="213,180,60,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12302,9 +12903,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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12312,35 +12913,35 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{c671f96e-2f37-4e60-9867-9a3746a7e824}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{cf092438-1d21-40b3-8218-4c8ef416cb6a}">
+        <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="comment" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="11" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.80000000000000004" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="50" fieldName="comment" textOpacity="0.80000000000000004" isExpression="0" namedStyle="Regular" fontSize="11" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="1" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="255,255,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.59999999999999998" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeOpacity="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.59999999999999998" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.59999999999999998" shapeType="0" shapeJoinStyle="128" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="1">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,255" type="QString"/>
-                        <Option name="joinstyle" value="round" 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="255,255,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.6" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="255,255,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.6" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12355,118 +12956,118 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="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 value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
-                      <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 value="true" type="bool" name="active"/>
+                        <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="4294967295"/>
-              <placement priority="5" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="5" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8200000000000001" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="4294967295"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="2" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="5" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="14" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="1" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1.8200000000000001" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <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 value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <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 value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{8f0bbb62-12a0-4d1f-856f-8a119d5b6a26}">
+          <rule description="Fence lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}">
             <settings calloutType="simple">
-              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="11" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="11" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="196,60,57,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="196,60,57,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -12489,34 +13090,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12531,112 +13132,112 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="6" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="6" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="2" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="1" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="14" layerType="LineGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="1" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <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="Map" name="PositionX">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <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 value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0" key="{b2f2009a-4ab7-4a86-a46e-7b85998f4204}">
+          <rule description="Cones lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}">
             <settings calloutType="simple">
-              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="11" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="11" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="196,60,57,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="196,60,57,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -12659,34 +13260,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12701,72 +13302,242 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="6" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="6" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="2" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="1" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="14" layerType="LineGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="1" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <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="Map" name="PositionX">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <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 value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}">
+            <settings calloutType="simple">
+              <text-style fontWeight="63" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="11" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
+                <families/>
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option value="" type="QString" name="name"/>
+                        <Option name="properties"/>
+                        <Option value="collection" type="QString" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                      <Option type="Map">
+                        <Option value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="196,60,57,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                      </Option>
+                      <prop v="0" k="angle"/>
+                      <prop v="square" k="cap_style"/>
+                      <prop v="196,60,57,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="circle" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="35,35,35,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="diameter" k="scale_method"/>
+                      <prop v="2" k="size"/>
+                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" name="name"/>
+                          <Option name="properties"/>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option value="" type="QString" name="name"/>
+                        <Option name="properties"/>
+                        <Option value="collection" type="QString" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <Option type="Map">
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
+                      </Option>
+                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="255,255,255,255" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="128,128,128,255" k="outline_color"/>
+                      <prop v="no" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" name="name"/>
+                          <Option name="properties"/>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="6" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="2" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="1" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="14" layerType="LineGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
+                    </Option>
+                    <Option type="Map" name="PositionX">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
+                    </Option>
+                    <Option type="Map" name="PositionY">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
+                    </Option>
+                  </Option>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -12775,62 +13546,62 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="&quot;id&quot;" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -12861,9 +13632,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12871,12 +13642,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -12887,70 +13658,70 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="group" configurationFlags="None">
+        <field configurationFlags="None" name="group">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="comment" configurationFlags="None">
+        <field configurationFlags="None" name="comment">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="moveable" configurationFlags="None">
+        <field configurationFlags="None" name="moveable">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="hidden" configurationFlags="None">
+        <field configurationFlags="None" name="hidden">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="fence_len" configurationFlags="None">
+        <field configurationFlags="None" name="fence_len">
           <editWidget type="Hidden">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="cone_len" configurationFlags="None">
+        <field configurationFlags="None" name="cone_len">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -12959,74 +13730,74 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="day" index="7" name=""/>
-        <alias field="fence_len" index="8" name=""/>
-        <alias field="cone_len" index="9" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="comment"/>
+        <alias index="3" name="" field="moveable"/>
+        <alias index="4" name="" field="type"/>
+        <alias index="5" name="" field="name"/>
+        <alias index="6" name="" field="hidden"/>
+        <alias index="7" name="" field="day"/>
+        <alias index="8" name="" field="fence_len"/>
+        <alias index="9" name="" field="cone_len"/>
       </aliases>
       <defaults>
-        <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=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="comment"/>
+        <default expression="" applyOnUpdate="0" field="moveable"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="hidden"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="fence_len"/>
+        <default expression="" applyOnUpdate="0" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="group" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="comment" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="moveable" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="hidden" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="fence_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="cone_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="group"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="moveable"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hidden"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fence_len"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cone_len"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="group" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="moveable" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="hidden" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="fence_len" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="comment"/>
+        <constraint desc="" exp="" field="moveable"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="hidden"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="fence_len"/>
+        <constraint desc="" exp="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" type="6" precision="0"/>
-        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" type="6" precision="0"/>
-        <field typeName="double precision" name="cone_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" type="6" precision="0"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" length="-1" typeName="double precision" subType="0" name="fence_len" comment="" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" length="-1" typeName="double precision" subType="0" name="fence_len" comment="" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" length="-1" typeName="double precision" subType="0" name="cone_len" comment="" type="6"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="group" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="group"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="373" hidden="0" name="comment" type="field"/>
-          <column width="-1" hidden="0" name="moveable" type="field"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
-          <column width="692" hidden="0" name="name" type="field"/>
-          <column width="-1" hidden="0" name="hidden" type="field"/>
-          <column width="-1" hidden="0" name="fence_len" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="-1" hidden="0" name="cone_len" type="field"/>
+          <column width="373" hidden="0" type="field" name="comment"/>
+          <column width="-1" hidden="0" type="field" name="moveable"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
+          <column width="692" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="hidden"/>
+          <column width="-1" hidden="0" type="field" name="fence_len"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="-1" hidden="0" type="field" name="cone_len"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13073,38 +13844,38 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -13177,58 +13948,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="164,113,88,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="164,113,88,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -13259,36 +14030,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="164,113,88,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="117,81,63,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="164,113,88,255" k="color"/>
@@ -13303,44 +14074,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="164,113,88,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="117,81,63,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -13363,54 +14134,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="0,178,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="1" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,178,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -13441,9 +14212,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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13454,60 +14225,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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" value="&quot;id&quot;" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -13538,9 +14309,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13548,12 +14319,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -13564,7 +14335,7 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -13573,24 +14344,24 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias index="0" name="" field="id"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
           <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
@@ -13626,7 +14397,7 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13634,7 +14405,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -13707,58 +14478,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="213,180,60,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="213,180,60,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -13789,36 +14560,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="213,180,60,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="152,129,43,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="213,180,60,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="152,129,43,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="213,180,60,255" k="color"/>
@@ -13833,44 +14604,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="213,180,60,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="152,129,43,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="213,180,60,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="152,129,43,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -13893,38 +14664,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="26,0,201,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="0,0,0,255" type="QString"/>
-                <Option name="outline_style" value="dot" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="b_diagonal" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="26,0,201,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="dot" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="b_diagonal" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="26,0,201,255" k="color"/>
@@ -13939,9 +14710,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13952,10 +14723,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
@@ -13966,56 +14738,56 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -14046,9 +14818,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14056,18 +14828,18 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" value="true" type="bool"/>
-                <Option name="field" value="id" type="QString"/>
-                <Option name="type" value="2" type="int"/>
+            <Option value="" type="QString" name="name"/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option value="true" type="bool" name="active"/>
+                <Option value="id" type="QString" name="field"/>
+                <Option value="2" type="int" name="type"/>
               </Option>
             </Option>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -14078,37 +14850,37 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="page" configurationFlags="None">
+        <field configurationFlags="None" name="page">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
@@ -14117,40 +14889,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="page"/>
+        <alias index="3" name="" field="day"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="page" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="page"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="page" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="page"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="page" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="page"/>
+        <constraint desc="" exp="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;page&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;">
         <columns>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="-1" hidden="0" name="page" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="-1" hidden="0" type="field" name="page"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14187,9 +14959,9 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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/>
@@ -14197,7 +14969,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -14262,7 +15034,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14273,7 +15045,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join upsertOnEdit="0" joinLayerId="marshals_by_position20161003112326575" editable="0" dynamicForm="0" customPrefix="csv_" targetFieldName="position" memoryCache="0" cascadedDelete="0" joinFieldName="position" hasCustomPrefix="1">
+        <join upsertOnEdit="0" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" customPrefix="csv_" targetFieldName="position" memoryCache="0" editable="0" cascadedDelete="0" dynamicForm="0">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="club"/>
@@ -14300,58 +15072,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="id" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="id">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="114,155,111,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="114,155,111,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -14382,36 +15154,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="114,155,111,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="81,111,79,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="81,111,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -14426,44 +15198,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="114,155,111,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="81,111,79,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="81,111,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14486,51 +15258,51 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" description="Show in marshal overview" label="Show by day in marshal plan" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" checkstate="0" symbol="1" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0" symbol="2" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" label="Show by day in marshal plan" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" symbol="1" checkstate="0" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" checkstate="0" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="0.8" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="0.8" type="marker" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
+            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="name" value="circle" 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="0,0,0,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="5" type="QString"/>
-                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="size_unit" value="Pixel" type="QString"/>
-                <Option name="vertical_anchor_point" value="1" type="QString"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="5" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="Pixel" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14553,42 +15325,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="0.8" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="0.8" type="marker" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
+            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="name" value="circle" 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="0,0,0,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="5" type="QString"/>
-                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="size_unit" value="Pixel" type="QString"/>
-                <Option name="vertical_anchor_point" value="1" type="QString"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="5" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="Pixel" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14611,42 +15383,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="0.01" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="0.01" type="marker" name="2" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
+            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="0,0,0,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0" 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="0.1" 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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="0.1" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14669,9 +15441,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14680,42 +15452,42 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{02580e06-5c28-4087-a4e2-d2705453c9fb}">
-          <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="{ce06e431-d417-4afe-97fa-8d4bf9e0207e}">
+          <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ce06e431-d417-4afe-97fa-8d4bf9e0207e}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="position" textOpacity="0.90000000000000002" isExpression="0" namedStyle="Semibold" fontSize="6" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.5" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="231,113,72,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="231,113,72,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -14738,34 +15510,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.1" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -14780,118 +15552,118 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="2" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="1" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="0" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="2" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" active="0" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{cad8c7f8-97e6-4c3e-89c4-6166bfc5203d}">
+          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" active="0" key="{cad8c7f8-97e6-4c3e-89c4-6166bfc5203d}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="position" textOpacity="0.90000000000000002" isExpression="0" namedStyle="Semibold" fontSize="6" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.5" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="231,113,72,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="231,113,72,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -14914,34 +15686,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.1" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -14956,110 +15728,110 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="2" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="1" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="0" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="2" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{d218bee5-b5a9-4347-ae20-a3b23b9aa8b5}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" filter="'marshal' = attribute( @atlas_feature , 'type' )" active="0" key="{d218bee5-b5a9-4347-ae20-a3b23b9aa8b5}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.5" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="position" textOpacity="0.5" isExpression="0" namedStyle="Semibold" fontSize="6" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.5" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeY="0.20000000000000001">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.4" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15074,189 +15846,189 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( @atlasfeature_id = $id, 1, 0)" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="AlwaysShow">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="FontOpacity" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="FontOpacity">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="FontStyle">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="ObstacleFactor">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="Priority" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="Priority">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="ShapeOpacity">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( @atlas_featureid = $id, 8, 6 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="Size">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="ZIndex" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="ZIndex">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
-              <placement priority="8" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="5" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="1"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="8" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="0" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1.8" minFeatureSize="0" upsidedownLabels="0" zIndex="5" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlasfeature_id = $id, 1, 0)" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="Priority">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlas_featureid = $id, 8, 6 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="Size">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'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="{91072baf-d72c-4be6-b15f-54994870beac}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{91072baf-d72c-4be6-b15f-54994870beac}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.59999999999999998" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="50" fieldName="position" textOpacity="0.59999999999999998" isExpression="0" namedStyle="Regular" fontSize="6" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.59999999999999998" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeY="0.20000000000000001">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="213,180,60,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="213,180,60,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -15279,34 +16051,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.4" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15321,148 +16093,148 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
-              <placement priority="8" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="5" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="1"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="8" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="0" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1.8" minFeatureSize="0" upsidedownLabels="0" zIndex="5" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Priority">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'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="{dbd6b3f9-ec3f-436c-ac51-c7866d412105}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{dbd6b3f9-ec3f-436c-ac51-c7866d412105}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="position" textOpacity="0.90000000000000002" isExpression="0" namedStyle="Semibold" fontSize="8" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeOpacity="0.90000000000000002" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,0,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.90000000000000002" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeY="0.20000000000000001">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="133,182,111,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="133,182,111,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -15485,34 +16257,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,0,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.4" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,0,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,0,255" k="color"/>
@@ -15527,108 +16299,108 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
-              <placement priority="10" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="10" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="1"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="0" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="0" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1.8" minFeatureSize="0" upsidedownLabels="0" zIndex="10" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Priority">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -15637,10 +16409,10 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
@@ -15652,191 +16424,191 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
-          <Option name="labeling/angleOffset" value="0" type="QString"/>
-          <Option name="labeling/blendMode" value="0" type="QString"/>
-          <Option name="labeling/bufferBlendMode" value="0" type="QString"/>
-          <Option name="labeling/bufferColorA" value="255" type="QString"/>
-          <Option name="labeling/bufferColorB" value="255" type="QString"/>
-          <Option name="labeling/bufferColorG" value="255" type="QString"/>
-          <Option name="labeling/bufferColorR" value="255" type="QString"/>
-          <Option name="labeling/bufferDraw" value="false" type="QString"/>
-          <Option name="labeling/bufferJoinStyle" value="64" type="QString"/>
-          <Option name="labeling/bufferNoFill" value="false" type="QString"/>
-          <Option name="labeling/bufferSize" value="1" type="QString"/>
-          <Option name="labeling/bufferSizeInMapUnits" value="false" type="QString"/>
-          <Option name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/bufferTransp" value="0" type="QString"/>
-          <Option name="labeling/centroidInside" value="false" type="QString"/>
-          <Option name="labeling/centroidWhole" value="false" type="QString"/>
-          <Option name="labeling/decimals" value="3" type="QString"/>
-          <Option name="labeling/displayAll" value="false" type="QString"/>
-          <Option name="labeling/dist" value="0" type="QString"/>
-          <Option name="labeling/distInMapUnits" value="false" type="QString"/>
-          <Option name="labeling/distMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/drawLabels" value="false" type="QString"/>
-          <Option name="labeling/enabled" value="false" type="QString"/>
-          <Option name="labeling/fieldName" value="position" type="QString"/>
-          <Option name="labeling/fitInPolygonOnly" value="false" type="QString"/>
-          <Option name="labeling/fontCapitals" value="0" type="QString"/>
-          <Option name="labeling/fontFamily" value="Myriad Pro" type="QString"/>
-          <Option name="labeling/fontItalic" value="false" type="QString"/>
-          <Option name="labeling/fontLetterSpacing" value="0" type="QString"/>
-          <Option name="labeling/fontLimitPixelSize" value="false" type="QString"/>
-          <Option name="labeling/fontMaxPixelSize" value="10000" type="QString"/>
-          <Option name="labeling/fontMinPixelSize" value="3" type="QString"/>
-          <Option name="labeling/fontSize" value="10" type="QString"/>
-          <Option name="labeling/fontSizeInMapUnits" value="false" type="QString"/>
-          <Option name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/fontStrikeout" value="false" type="QString"/>
-          <Option name="labeling/fontUnderline" value="false" type="QString"/>
-          <Option name="labeling/fontWeight" value="63" type="QString"/>
-          <Option name="labeling/fontWordSpacing" value="0" type="QString"/>
-          <Option name="labeling/formatNumbers" value="false" type="QString"/>
-          <Option name="labeling/isExpression" value="false" type="QString"/>
-          <Option name="labeling/labelOffsetInMapUnits" value="true" type="QString"/>
-          <Option name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/labelPerPart" value="false" type="QString"/>
-          <Option name="labeling/leftDirectionSymbol" value="&lt;" type="QString"/>
-          <Option name="labeling/limitNumLabels" value="false" type="QString"/>
-          <Option name="labeling/maxCurvedCharAngleIn" value="20" type="QString"/>
-          <Option name="labeling/maxCurvedCharAngleOut" value="-20" type="QString"/>
-          <Option name="labeling/maxNumLabels" value="2000" type="QString"/>
-          <Option name="labeling/mergeLines" value="false" type="QString"/>
-          <Option name="labeling/minFeatureSize" value="0" type="QString"/>
-          <Option name="labeling/multilineAlign" value="0" type="QString"/>
-          <Option name="labeling/multilineHeight" value="1" type="QString"/>
-          <Option name="labeling/namedStyle" value="Semibold" type="QString"/>
-          <Option name="labeling/obstacle" value="true" type="QString"/>
-          <Option name="labeling/obstacleFactor" value="1" type="QString"/>
-          <Option name="labeling/obstacleType" value="0" type="QString"/>
-          <Option name="labeling/offsetType" value="0" type="QString"/>
-          <Option name="labeling/placeDirectionSymbol" value="0" type="QString"/>
-          <Option name="labeling/placement" value="0" type="QString"/>
-          <Option name="labeling/placementFlags" value="10" type="QString"/>
-          <Option name="labeling/plussign" value="false" type="QString"/>
-          <Option name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString"/>
-          <Option name="labeling/preserveRotation" value="true" type="QString"/>
-          <Option name="labeling/previewBkgrdColor" value="#ffffff" type="QString"/>
-          <Option name="labeling/priority" value="5" type="QString"/>
-          <Option name="labeling/quadOffset" value="4" type="QString"/>
-          <Option name="labeling/repeatDistance" value="0" type="QString"/>
-          <Option name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/repeatDistanceUnit" value="1" type="QString"/>
-          <Option name="labeling/reverseDirectionSymbol" value="false" type="QString"/>
-          <Option name="labeling/rightDirectionSymbol" value=">" type="QString"/>
-          <Option name="labeling/scaleMax" value="10000000" type="QString"/>
-          <Option name="labeling/scaleMin" value="1" type="QString"/>
-          <Option name="labeling/scaleVisibility" value="false" type="QString"/>
-          <Option name="labeling/shadowBlendMode" value="6" type="QString"/>
-          <Option name="labeling/shadowColorB" value="0" type="QString"/>
-          <Option name="labeling/shadowColorG" value="0" type="QString"/>
-          <Option name="labeling/shadowColorR" value="0" type="QString"/>
-          <Option name="labeling/shadowDraw" value="false" type="QString"/>
-          <Option name="labeling/shadowOffsetAngle" value="135" type="QString"/>
-          <Option name="labeling/shadowOffsetDist" value="1" type="QString"/>
-          <Option name="labeling/shadowOffsetGlobal" value="true" type="QString"/>
-          <Option name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shadowOffsetUnits" value="1" type="QString"/>
-          <Option name="labeling/shadowRadius" value="1.5" type="QString"/>
-          <Option name="labeling/shadowRadiusAlphaOnly" value="false" type="QString"/>
-          <Option name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shadowRadiusUnits" value="1" type="QString"/>
-          <Option name="labeling/shadowScale" value="100" type="QString"/>
-          <Option name="labeling/shadowTransparency" value="30" type="QString"/>
-          <Option name="labeling/shadowUnder" value="0" type="QString"/>
-          <Option name="labeling/shapeBlendMode" value="0" type="QString"/>
-          <Option name="labeling/shapeBorderColorA" value="255" type="QString"/>
-          <Option name="labeling/shapeBorderColorB" value="128" type="QString"/>
-          <Option name="labeling/shapeBorderColorG" value="128" type="QString"/>
-          <Option name="labeling/shapeBorderColorR" value="128" type="QString"/>
-          <Option name="labeling/shapeBorderWidth" value="0" type="QString"/>
-          <Option name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeBorderWidthUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeDraw" value="true" type="QString"/>
-          <Option name="labeling/shapeFillColorA" value="255" type="QString"/>
-          <Option name="labeling/shapeFillColorB" value="138" type="QString"/>
-          <Option name="labeling/shapeFillColorG" value="0" type="QString"/>
-          <Option name="labeling/shapeFillColorR" value="101" type="QString"/>
-          <Option name="labeling/shapeJoinStyle" value="64" type="QString"/>
-          <Option name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeOffsetUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeOffsetX" value="0" type="QString"/>
-          <Option name="labeling/shapeOffsetY" value="0" type="QString"/>
-          <Option name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeRadiiUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeRadiiX" value="0" type="QString"/>
-          <Option name="labeling/shapeRadiiY" value="0" type="QString"/>
-          <Option name="labeling/shapeRotation" value="0" type="QString"/>
-          <Option name="labeling/shapeRotationType" value="0" type="QString"/>
-          <Option name="labeling/shapeSVGFile" value="" type="QString"/>
-          <Option name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeSizeType" value="0" type="QString"/>
-          <Option name="labeling/shapeSizeUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeSizeX" value="0" type="QString"/>
-          <Option name="labeling/shapeSizeY" value="0" type="QString"/>
-          <Option name="labeling/shapeTransparency" value="0" type="QString"/>
-          <Option name="labeling/shapeType" value="0" type="QString"/>
-          <Option name="labeling/textColorA" value="255" type="QString"/>
-          <Option name="labeling/textColorB" value="255" type="QString"/>
-          <Option name="labeling/textColorG" value="255" type="QString"/>
-          <Option name="labeling/textColorR" value="255" type="QString"/>
-          <Option name="labeling/textTransp" value="0" type="QString"/>
-          <Option name="labeling/upsidedownLabels" value="0" type="QString"/>
-          <Option name="labeling/wrapChar" value="" type="QString"/>
-          <Option name="labeling/xOffset" value="0" type="QString"/>
-          <Option name="labeling/yOffset" value="0" type="QString"/>
-          <Option name="labeling/zIndex" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/angleOffset"/>
+          <Option value="0" type="QString" name="labeling/blendMode"/>
+          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
+          <Option value="255" type="QString" name="labeling/bufferColorA"/>
+          <Option value="255" type="QString" name="labeling/bufferColorB"/>
+          <Option value="255" type="QString" name="labeling/bufferColorG"/>
+          <Option value="255" type="QString" name="labeling/bufferColorR"/>
+          <Option value="false" type="QString" name="labeling/bufferDraw"/>
+          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
+          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
+          <Option value="1" type="QString" name="labeling/bufferSize"/>
+          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/bufferTransp"/>
+          <Option value="false" type="QString" name="labeling/centroidInside"/>
+          <Option value="false" type="QString" name="labeling/centroidWhole"/>
+          <Option value="3" type="QString" name="labeling/decimals"/>
+          <Option value="false" type="QString" name="labeling/displayAll"/>
+          <Option value="0" type="QString" name="labeling/dist"/>
+          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/drawLabels"/>
+          <Option value="false" type="QString" name="labeling/enabled"/>
+          <Option value="position" type="QString" name="labeling/fieldName"/>
+          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
+          <Option value="0" type="QString" name="labeling/fontCapitals"/>
+          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
+          <Option value="false" type="QString" name="labeling/fontItalic"/>
+          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
+          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
+          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
+          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
+          <Option value="10" type="QString" name="labeling/fontSize"/>
+          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
+          <Option value="false" type="QString" name="labeling/fontUnderline"/>
+          <Option value="63" type="QString" name="labeling/fontWeight"/>
+          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
+          <Option value="false" type="QString" name="labeling/formatNumbers"/>
+          <Option value="false" type="QString" name="labeling/isExpression"/>
+          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/labelPerPart"/>
+          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
+          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
+          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
+          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
+          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
+          <Option value="false" type="QString" name="labeling/mergeLines"/>
+          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
+          <Option value="0" type="QString" name="labeling/multilineAlign"/>
+          <Option value="1" type="QString" name="labeling/multilineHeight"/>
+          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
+          <Option value="true" type="QString" name="labeling/obstacle"/>
+          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
+          <Option value="0" type="QString" name="labeling/obstacleType"/>
+          <Option value="0" type="QString" name="labeling/offsetType"/>
+          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/placement"/>
+          <Option value="10" type="QString" name="labeling/placementFlags"/>
+          <Option value="false" type="QString" name="labeling/plussign"/>
+          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
+          <Option value="true" type="QString" name="labeling/preserveRotation"/>
+          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
+          <Option value="5" type="QString" name="labeling/priority"/>
+          <Option value="4" type="QString" name="labeling/quadOffset"/>
+          <Option value="0" type="QString" name="labeling/repeatDistance"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
+          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
+          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
+          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
+          <Option value="1" type="QString" name="labeling/scaleMin"/>
+          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
+          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
+          <Option value="0" type="QString" name="labeling/shadowColorB"/>
+          <Option value="0" type="QString" name="labeling/shadowColorG"/>
+          <Option value="0" type="QString" name="labeling/shadowColorR"/>
+          <Option value="false" type="QString" name="labeling/shadowDraw"/>
+          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
+          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
+          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
+          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
+          <Option value="100" type="QString" name="labeling/shadowScale"/>
+          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
+          <Option value="0" type="QString" name="labeling/shadowUnder"/>
+          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
+          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
+          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
+          <Option value="true" type="QString" name="labeling/shapeDraw"/>
+          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
+          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
+          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
+          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
+          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
+          <Option value="0" type="QString" name="labeling/shapeRotation"/>
+          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
+          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
+          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
+          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
+          <Option value="0" type="QString" name="labeling/shapeType"/>
+          <Option value="255" type="QString" name="labeling/textColorA"/>
+          <Option value="255" type="QString" name="labeling/textColorB"/>
+          <Option value="255" type="QString" name="labeling/textColorG"/>
+          <Option value="255" type="QString" name="labeling/textColorR"/>
+          <Option value="0" type="QString" name="labeling/textTransp"/>
+          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
+          <Option value="" type="QString" name="labeling/wrapChar"/>
+          <Option value="0" type="QString" name="labeling/xOffset"/>
+          <Option value="0" type="QString" name="labeling/yOffset"/>
+          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -15867,9 +16639,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15877,12 +16649,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -15893,116 +16665,116 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="false" type="bool"/>
-                <Option name="UseHtml" value="false" type="bool"/>
+                <Option value="false" type="bool" name="IsMultiline"/>
+                <Option value="false" type="bool" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="false" type="bool"/>
-                <Option name="UseHtml" value="false" type="bool"/>
+                <Option value="false" type="bool" name="IsMultiline"/>
+                <Option value="false" type="bool" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="notes" configurationFlags="None">
+        <field configurationFlags="None" name="notes">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="xyposition" configurationFlags="None">
+        <field configurationFlags="None" name="xyposition">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_position" configurationFlags="None">
+        <field configurationFlags="None" name="csv_position">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_club" configurationFlags="None">
+        <field configurationFlags="None" name="csv_club">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="csv_firstname" configurationFlags="None">
+        <field configurationFlags="None" name="csv_firstname">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_surname" configurationFlags="None">
+        <field configurationFlags="None" name="csv_surname">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_days" configurationFlags="None">
+        <field configurationFlags="None" name="csv_days">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_first_runner" configurationFlags="None">
+        <field configurationFlags="None" name="csv_first_runner">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_last_runner" configurationFlags="None">
+        <field configurationFlags="None" name="csv_last_runner">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_instructions" configurationFlags="None">
+        <field configurationFlags="None" name="csv_instructions">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -16011,90 +16783,90 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="xyposition" index="4" name=""/>
-        <alias field="day" index="5" name=""/>
-        <alias field="csv_position" index="6" name=""/>
-        <alias field="csv_club" index="7" name=""/>
-        <alias field="csv_firstname" index="8" name=""/>
-        <alias field="csv_surname" index="9" name=""/>
-        <alias field="csv_days" index="10" name=""/>
-        <alias field="csv_first_runner" index="11" name=""/>
-        <alias field="csv_last_runner" index="12" name=""/>
-        <alias field="csv_instructions" index="13" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="position"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="notes"/>
+        <alias index="4" name="" field="xyposition"/>
+        <alias index="5" name="" field="day"/>
+        <alias index="6" name="" field="csv_position"/>
+        <alias index="7" name="" field="csv_club"/>
+        <alias index="8" name="" field="csv_firstname"/>
+        <alias index="9" name="" field="csv_surname"/>
+        <alias index="10" name="" field="csv_days"/>
+        <alias index="11" name="" field="csv_first_runner"/>
+        <alias index="12" name="" field="csv_last_runner"/>
+        <alias index="13" name="" field="csv_instructions"/>
       </aliases>
       <defaults>
-        <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="xyposition" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="csv_position" applyOnUpdate="0" expression=""/>
-        <default field="csv_club" applyOnUpdate="0" expression=""/>
-        <default field="csv_firstname" applyOnUpdate="0" expression=""/>
-        <default field="csv_surname" applyOnUpdate="0" expression=""/>
-        <default field="csv_days" applyOnUpdate="0" expression=""/>
-        <default field="csv_first_runner" applyOnUpdate="0" expression=""/>
-        <default field="csv_last_runner" applyOnUpdate="0" expression=""/>
-        <default field="csv_instructions" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="position"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="notes"/>
+        <default expression="" applyOnUpdate="0" field="xyposition"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="csv_position"/>
+        <default expression="" applyOnUpdate="0" field="csv_club"/>
+        <default expression="" applyOnUpdate="0" field="csv_firstname"/>
+        <default expression="" applyOnUpdate="0" field="csv_surname"/>
+        <default expression="" applyOnUpdate="0" field="csv_days"/>
+        <default expression="" applyOnUpdate="0" field="csv_first_runner"/>
+        <default expression="" applyOnUpdate="0" field="csv_last_runner"/>
+        <default expression="" applyOnUpdate="0" field="csv_instructions"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="notes" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="xyposition" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_club" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_firstname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_surname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_days" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_first_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_last_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_instructions" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="position"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="notes"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="xyposition"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_position"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_club"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_firstname"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_surname"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_days"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_first_runner"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_last_runner"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_instructions"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="notes" desc="" exp=""/>
-        <constraint field="xyposition" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="csv_position" desc="" exp=""/>
-        <constraint field="csv_club" desc="" exp=""/>
-        <constraint field="csv_firstname" desc="" exp=""/>
-        <constraint field="csv_surname" desc="" exp=""/>
-        <constraint field="csv_days" desc="" exp=""/>
-        <constraint field="csv_first_runner" desc="" exp=""/>
-        <constraint field="csv_last_runner" desc="" exp=""/>
-        <constraint field="csv_instructions" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="position"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="notes"/>
+        <constraint desc="" exp="" field="xyposition"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="csv_position"/>
+        <constraint desc="" exp="" field="csv_club"/>
+        <constraint desc="" exp="" field="csv_firstname"/>
+        <constraint desc="" exp="" field="csv_surname"/>
+        <constraint desc="" exp="" field="csv_days"/>
+        <constraint desc="" exp="" field="csv_first_runner"/>
+        <constraint desc="" exp="" field="csv_last_runner"/>
+        <constraint desc="" exp="" field="csv_instructions"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="position" type="field"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
-          <column width="-1" hidden="0" name="notes" type="field"/>
-          <column width="-1" hidden="0" name="xyposition" type="field"/>
-          <column width="-1" hidden="0" name="csv_club" type="field"/>
-          <column width="-1" hidden="0" name="csv_first_runner" type="field"/>
-          <column width="-1" hidden="0" name="csv_last_runner" type="field"/>
-          <column width="-1" hidden="0" name="csv_firstname" type="field"/>
-          <column width="-1" hidden="0" name="csv_surname" type="field"/>
-          <column width="-1" hidden="0" name="csv_position" type="field"/>
-          <column width="-1" hidden="0" name="csv_days" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="-1" hidden="0" name="csv_instructions" type="field"/>
+          <column width="-1" hidden="0" type="field" name="position"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
+          <column width="-1" hidden="0" type="field" name="notes"/>
+          <column width="-1" hidden="0" type="field" name="xyposition"/>
+          <column width="-1" hidden="0" type="field" name="csv_club"/>
+          <column width="-1" hidden="0" type="field" name="csv_first_runner"/>
+          <column width="-1" hidden="0" type="field" name="csv_last_runner"/>
+          <column width="-1" hidden="0" type="field" name="csv_firstname"/>
+          <column width="-1" hidden="0" type="field" name="csv_surname"/>
+          <column width="-1" hidden="0" type="field" name="csv_position"/>
+          <column width="-1" hidden="0" type="field" name="csv_days"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="-1" hidden="0" type="field" name="csv_instructions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16162,63 +16934,63 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="xyposition"/>
       </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_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_races" labelOnTop="0"/>
-        <field name="csv_surname" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="id" 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_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_races"/>
+        <field labelOnTop="0" name="csv_surname"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <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_days" reuseLastValue="0"/>
-        <field name="csv_email" reuseLastValue="0"/>
-        <field name="csv_first_runner" reuseLastValue="0"/>
-        <field name="csv_firstname" reuseLastValue="0"/>
-        <field name="csv_instructions" reuseLastValue="0"/>
-        <field name="csv_last_runner" reuseLastValue="0"/>
-        <field name="csv_name" reuseLastValue="0"/>
-        <field name="csv_phone" reuseLastValue="0"/>
-        <field name="csv_position" reuseLastValue="0"/>
-        <field name="csv_races" reuseLastValue="0"/>
-        <field name="csv_surname" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="notes" reuseLastValue="0"/>
-        <field name="position" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
-        <field name="xyposition" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="csv_captain"/>
+        <field reuseLastValue="0" name="csv_captain_email"/>
+        <field reuseLastValue="0" name="csv_captain_phone"/>
+        <field reuseLastValue="0" name="csv_club"/>
+        <field reuseLastValue="0" name="csv_days"/>
+        <field reuseLastValue="0" name="csv_email"/>
+        <field reuseLastValue="0" name="csv_first_runner"/>
+        <field reuseLastValue="0" name="csv_firstname"/>
+        <field reuseLastValue="0" name="csv_instructions"/>
+        <field reuseLastValue="0" name="csv_last_runner"/>
+        <field reuseLastValue="0" name="csv_name"/>
+        <field reuseLastValue="0" name="csv_phone"/>
+        <field reuseLastValue="0" name="csv_position"/>
+        <field reuseLastValue="0" name="csv_races"/>
+        <field reuseLastValue="0" name="csv_surname"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="notes"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="type"/>
+        <field reuseLastValue="0" name="xyposition"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -16268,7 +17040,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" geometry="No geometry" type="vector" minScale="1e+08" readOnly="0" maxScale="100000" refreshOnNotifyMessage="" wkbType="NoGeometry" styleCategories="AllStyleCategories">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" geometry="No geometry" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08" readOnly="0" maxScale="100000" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" type="vector" wkbType="NoGeometry" legendPlaceholderImage="">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -16321,7 +17093,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16334,8 +17106,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="marshal_positions20160930121322287"/>
         <layer id="all_routes20170907054841602"/>
+        <layer id="marshal_positions20160930121322287"/>
       </dataDependencies>
       <expressionfields/>
       <map-layer-style-manager current="default">
@@ -16349,58 +17121,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="243,166,178,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -16431,36 +17203,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="243,166,178,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="174,119,127,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="243,166,178,255" k="color"/>
@@ -16475,44 +17247,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="243,166,178,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="174,119,127,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -16535,9 +17307,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16546,13 +17318,13 @@ 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" value="first_name" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="first_name" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
@@ -16562,126 +17334,126 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="club" configurationFlags="None">
+        <field configurationFlags="None" name="club">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="firstname" configurationFlags="None">
+        <field configurationFlags="None" name="firstname">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="surname" configurationFlags="None">
+        <field configurationFlags="None" name="surname">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="phone" configurationFlags="None">
+        <field configurationFlags="None" name="phone">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="email" configurationFlags="None">
+        <field configurationFlags="None" name="email">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="captain" configurationFlags="None">
+        <field configurationFlags="None" name="captain">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="captain_phone" configurationFlags="None">
+        <field configurationFlags="None" name="captain_phone">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="captain_email" configurationFlags="None">
+        <field configurationFlags="None" name="captain_email">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="days" configurationFlags="None">
+        <field configurationFlags="None" name="days">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="races" configurationFlags="None">
+        <field configurationFlags="None" name="races">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="first_runner" configurationFlags="None">
+        <field configurationFlags="None" name="first_runner">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="last_runner" configurationFlags="None">
+        <field configurationFlags="None" name="last_runner">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="instructions" configurationFlags="None">
+        <field configurationFlags="None" name="instructions">
           <editWidget type="">
             <config>
               <Option/>
@@ -16690,94 +17462,94 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="position" index="0" name=""/>
-        <alias field="club" index="1" name=""/>
-        <alias field="firstname" index="2" name=""/>
-        <alias field="surname" index="3" name=""/>
-        <alias field="name" index="4" name=""/>
-        <alias field="phone" index="5" name=""/>
-        <alias field="email" index="6" name=""/>
-        <alias field="captain" index="7" name=""/>
-        <alias field="captain_phone" index="8" name=""/>
-        <alias field="captain_email" index="9" name=""/>
-        <alias field="days" index="10" name=""/>
-        <alias field="races" index="11" name=""/>
-        <alias field="first_runner" index="12" name=""/>
-        <alias field="last_runner" index="13" name=""/>
-        <alias field="instructions" index="14" name=""/>
+        <alias index="0" name="" field="position"/>
+        <alias index="1" name="" field="club"/>
+        <alias index="2" name="" field="firstname"/>
+        <alias index="3" name="" field="surname"/>
+        <alias index="4" name="" field="name"/>
+        <alias index="5" name="" field="phone"/>
+        <alias index="6" name="" field="email"/>
+        <alias index="7" name="" field="captain"/>
+        <alias index="8" name="" field="captain_phone"/>
+        <alias index="9" name="" field="captain_email"/>
+        <alias index="10" name="" field="days"/>
+        <alias index="11" name="" field="races"/>
+        <alias index="12" name="" field="first_runner"/>
+        <alias index="13" name="" field="last_runner"/>
+        <alias index="14" name="" field="instructions"/>
       </aliases>
       <defaults>
-        <default field="position" applyOnUpdate="0" expression=""/>
-        <default field="club" applyOnUpdate="0" expression=""/>
-        <default field="firstname" applyOnUpdate="0" expression=""/>
-        <default field="surname" applyOnUpdate="0" expression=""/>
-        <default field="name" 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="captain_email" applyOnUpdate="0" expression=""/>
-        <default field="days" applyOnUpdate="0" expression=""/>
-        <default field="races" applyOnUpdate="0" expression=""/>
-        <default field="first_runner" applyOnUpdate="0" expression=""/>
-        <default field="last_runner" applyOnUpdate="0" expression=""/>
-        <default field="instructions" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="position"/>
+        <default expression="" applyOnUpdate="0" field="club"/>
+        <default expression="" applyOnUpdate="0" field="firstname"/>
+        <default expression="" applyOnUpdate="0" field="surname"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="phone"/>
+        <default expression="" applyOnUpdate="0" field="email"/>
+        <default expression="" applyOnUpdate="0" field="captain"/>
+        <default expression="" applyOnUpdate="0" field="captain_phone"/>
+        <default expression="" applyOnUpdate="0" field="captain_email"/>
+        <default expression="" applyOnUpdate="0" field="days"/>
+        <default expression="" applyOnUpdate="0" field="races"/>
+        <default expression="" applyOnUpdate="0" field="first_runner"/>
+        <default expression="" applyOnUpdate="0" field="last_runner"/>
+        <default expression="" applyOnUpdate="0" field="instructions"/>
       </defaults>
       <constraints>
-        <constraint field="position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="club" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="firstname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="surname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="phone" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="email" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="captain" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="captain_phone" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="captain_email" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="days" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="races" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="first_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="last_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="instructions" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="position"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="club"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="firstname"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="surname"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="phone"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="email"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="captain"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="captain_phone"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="captain_email"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="days"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="races"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="first_runner"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="last_runner"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="instructions"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="club" desc="" exp=""/>
-        <constraint field="firstname" desc="" exp=""/>
-        <constraint field="surname" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="phone" desc="" exp=""/>
-        <constraint field="email" desc="" exp=""/>
-        <constraint field="captain" desc="" exp=""/>
-        <constraint field="captain_phone" desc="" exp=""/>
-        <constraint field="captain_email" desc="" exp=""/>
-        <constraint field="days" desc="" exp=""/>
-        <constraint field="races" desc="" exp=""/>
-        <constraint field="first_runner" desc="" exp=""/>
-        <constraint field="last_runner" desc="" exp=""/>
-        <constraint field="instructions" desc="" exp=""/>
+        <constraint desc="" exp="" field="position"/>
+        <constraint desc="" exp="" field="club"/>
+        <constraint desc="" exp="" field="firstname"/>
+        <constraint desc="" exp="" field="surname"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="phone"/>
+        <constraint desc="" exp="" field="email"/>
+        <constraint desc="" exp="" field="captain"/>
+        <constraint desc="" exp="" field="captain_phone"/>
+        <constraint desc="" exp="" field="captain_email"/>
+        <constraint desc="" exp="" field="days"/>
+        <constraint desc="" exp="" field="races"/>
+        <constraint desc="" exp="" field="first_runner"/>
+        <constraint desc="" exp="" field="last_runner"/>
+        <constraint desc="" exp="" field="instructions"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="position" type="field"/>
-          <column width="221" hidden="0" name="name" type="field"/>
-          <column width="-1" hidden="0" name="club" type="field"/>
-          <column width="-1" hidden="0" name="phone" type="field"/>
-          <column width="-1" hidden="0" name="email" type="field"/>
-          <column width="-1" hidden="0" name="captain" type="field"/>
-          <column width="-1" hidden="0" name="races" type="field"/>
+          <column width="-1" hidden="0" type="field" name="position"/>
+          <column width="221" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="club"/>
+          <column width="-1" hidden="0" type="field" name="phone"/>
+          <column width="-1" hidden="0" type="field" name="email"/>
+          <column width="-1" hidden="0" type="field" name="captain"/>
+          <column width="-1" hidden="0" type="field" name="races"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="first_runner" type="field"/>
-          <column width="-1" hidden="0" name="last_runner" type="field"/>
-          <column width="-1" hidden="0" name="instructions" type="field"/>
-          <column width="-1" hidden="0" name="firstname" type="field"/>
-          <column width="-1" hidden="0" name="surname" type="field"/>
-          <column width="-1" hidden="0" name="captain_phone" type="field"/>
-          <column width="-1" hidden="0" name="captain_email" type="field"/>
+          <column width="-1" hidden="0" type="field" name="first_runner"/>
+          <column width="-1" hidden="0" type="field" name="last_runner"/>
+          <column width="-1" hidden="0" type="field" name="instructions"/>
+          <column width="-1" hidden="0" type="field" name="firstname"/>
+          <column width="-1" hidden="0" type="field" name="surname"/>
+          <column width="-1" hidden="0" type="field" name="captain_phone"/>
+          <column width="-1" hidden="0" type="field" name="captain_email"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16828,23 +17600,23 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="tshirt"/>
       </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_number" labelOnTop="0"/>
-        <field name="club" labelOnTop="0"/>
-        <field name="email" labelOnTop="0"/>
-        <field name="first_name" labelOnTop="0"/>
-        <field name="first_runner" 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="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_number"/>
+        <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="email"/>
+        <field labelOnTop="0" name="first_name"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <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="tshirt"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16852,7 +17624,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -16917,7 +17689,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16942,58 +17714,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="141,90,153,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="141,90,153,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17024,36 +17796,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="141,90,153,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="101,64,109,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="141,90,153,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="101,64,109,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="141,90,153,255" k="color"/>
@@ -17068,44 +17840,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="141,90,153,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="101,64,109,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="141,90,153,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="101,64,109,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -17128,58 +17900,58 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
           <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
           <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="123,211,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="1" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="123,211,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17210,50 +17982,50 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="flat" type="QString"/>
-                <Option name="customdash" value="4;1;1;1" 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="103,34,144,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="1.25" 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="1" type="QString"/>
-                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="4;1;1;1" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1.25" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -17284,30 +18056,30 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -17327,33 +18099,33 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="5" 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 value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -17369,32 +18141,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@1@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@1@1@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="103,34,144,255" type="QString"/>
-                        <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -17409,9 +18181,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -17424,60 +18196,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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" value="id" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -17508,9 +18280,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17518,12 +18290,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -17534,14 +18306,14 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -17550,30 +18322,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17609,8 +18381,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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/>
@@ -17618,7 +18390,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -17683,7 +18455,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17708,58 +18480,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="232,113,141,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="232,113,141,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17790,36 +18562,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="232,113,141,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="166,81,101,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="232,113,141,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="166,81,101,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="232,113,141,255" k="color"/>
@@ -17834,44 +18606,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="232,113,141,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="166,81,101,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="232,113,141,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="166,81,101,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -17894,44 +18666,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="name" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8.5" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.75" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" fieldName="name" textOpacity="0.75" isExpression="0" namedStyle="Regular" fontSize="8.5" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1.5" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSize="1.5" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -17946,158 +18718,158 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelRotation" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
-                    <Option name="type" value="3" type="int"/>
+                <Option value="" type="QString" name="name"/>
+                <Option type="Map" name="properties">
+                  <Option type="Map" name="LabelRotation">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
-                  <Option name="PositionX" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="field" value="label_x" type="QString"/>
-                    <Option name="type" value="2" type="int"/>
+                  <Option type="Map" name="PositionX">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="label_x" type="QString" name="field"/>
+                    <Option value="2" type="int" name="type"/>
                   </Option>
-                  <Option name="PositionY" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="field" value="label_y" type="QString"/>
-                    <Option name="type" value="2" type="int"/>
+                  <Option type="Map" name="PositionY">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="label_y" type="QString" name="field"/>
+                    <Option value="2" type="int" name="type"/>
                   </Option>
-                  <Option name="Size" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString"/>
-                    <Option name="type" value="3" type="int"/>
+                  <Option type="Map" name="Size">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
                 </Option>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-          <placement priority="1" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="0.20000000000000001" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+          <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="1" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="0" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="2" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="PreventOverlap" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="0.20000000000000001" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="LabelRotation" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="LabelRotation">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="PositionX" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_x" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionX">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_x" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="PositionY" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_y" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionY">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_y" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Size">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-              <Option name="blendMode" value="0" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" value="" type="QString"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" value="false" type="bool"/>
-              <Option name="enabled" value="0" type="QString"/>
-              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-              <Option name="minLength" value="0" type="double"/>
-              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="minLengthUnit" value="MM" type="QString"/>
-              <Option name="offsetFromAnchor" value="0" type="double"/>
-              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-              <Option name="offsetFromLabel" value="0" type="double"/>
-              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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" value="&quot;name&quot;" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="&quot;name&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -18128,9 +18900,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18138,12 +18910,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -18154,157 +18926,157 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="osm_id" configurationFlags="None">
+        <field configurationFlags="None" name="osm_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="z_order" configurationFlags="None">
+        <field configurationFlags="None" name="z_order">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="population" configurationFlags="None">
+        <field configurationFlags="None" name="population">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_x" configurationFlags="None">
+        <field configurationFlags="None" name="label_x">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_y" configurationFlags="None">
+        <field configurationFlags="None" name="label_y">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_rota" configurationFlags="None">
+        <field configurationFlags="None" name="label_rota">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="osm_id"/>
+        <alias index="2" name="" field="name"/>
+        <alias index="3" name="" field="type"/>
+        <alias index="4" name="" field="z_order"/>
+        <alias index="5" name="" field="population"/>
+        <alias index="6" name="" field="label_x"/>
+        <alias index="7" name="" field="label_y"/>
+        <alias index="8" name="" field="label_rota"/>
       </aliases>
       <defaults>
-        <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=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="osm_id"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="z_order"/>
+        <default expression="" applyOnUpdate="0" field="population"/>
+        <default expression="" applyOnUpdate="0" field="label_x"/>
+        <default expression="" applyOnUpdate="0" field="label_y"/>
+        <default expression="" applyOnUpdate="0" field="label_rota"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="osm_id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="z_order" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="population" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label_x" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label_y" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label_rota" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="osm_id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="z_order"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="population"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rota"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="osm_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="z_order" desc="" exp=""/>
-        <constraint field="population" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rota" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="osm_id"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="z_order"/>
+        <constraint desc="" exp="" field="population"/>
+        <constraint desc="" exp="" field="label_x"/>
+        <constraint desc="" exp="" field="label_y"/>
+        <constraint desc="" exp="" field="label_rota"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="osm_id" type="field"/>
-          <column width="-1" hidden="0" name="name" type="field"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
-          <column width="-1" hidden="0" name="z_order" type="field"/>
-          <column width="-1" hidden="0" name="population" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="osm_id"/>
+          <column width="-1" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
+          <column width="-1" hidden="0" type="field" name="z_order"/>
+          <column width="-1" hidden="0" type="field" name="population"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="label_x" type="field"/>
-          <column width="-1" hidden="0" name="label_y" type="field"/>
-          <column width="-1" hidden="0" name="label_rota" type="field"/>
+          <column width="-1" hidden="0" type="field" name="label_x"/>
+          <column width="-1" hidden="0" type="field" name="label_y"/>
+          <column width="-1" hidden="0" type="field" name="label_rota"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18347,15 +19119,15 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="z_order"/>
       </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/>
@@ -18363,7 +19135,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -18428,7 +19200,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18453,58 +19225,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="255,158,23,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,158,23,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -18535,36 +19307,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,158,23,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="182,113,16,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,158,23,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="182,113,16,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,158,23,255" k="color"/>
@@ -18579,44 +19351,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="255,158,23,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="182,113,16,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="255,158,23,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="182,113,16,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -18639,52 +19411,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="7" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.80000000000000004" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" textOpacity="0.80000000000000004" isExpression="1" namedStyle="Regular" fontSize="7" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="196,60,57,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="196,60,57,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -18707,34 +19479,34 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -18749,107 +19521,107 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-          <placement priority="3" geometryGeneratorEnabled="0" placement="3" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="4" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MapUnit" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="0.29999999999999999" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="5" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+          <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MapUnit" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="3" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="0" xOffset="0" offsetType="0" placement="3" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="4" layerType="LineGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="PreventOverlap" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="1" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="0.29999999999999999" minFeatureSize="5" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="AlwaysShow" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="always_sho" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="AlwaysShow">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="always_sho" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="IsObstacle" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="&quot;&quot;" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="IsObstacle">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="&quot;&quot;" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="LabelRotation" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="LabelRotation">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="PositionX" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_x" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionX">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_x" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="PositionY" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_y" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionY">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_y" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="Priority" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="Priority">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
-                <Option name="Show" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="auxiliary_storage_labeling_show" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="Show">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="auxiliary_storage_labeling_show" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Size">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-              <Option name="blendMode" value="0" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" value="" type="QString"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" value="false" type="bool"/>
-              <Option name="enabled" value="0" type="QString"/>
-              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-              <Option name="minLength" value="0" type="double"/>
-              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="minLengthUnit" value="MM" type="QString"/>
-              <Option name="offsetFromAnchor" value="0" type="double"/>
-              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-              <Option name="offsetFromLabel" value="0" type="double"/>
-              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
@@ -18860,56 +19632,56 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -18940,9 +19712,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18950,12 +19722,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -18966,121 +19738,121 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="osm_id" configurationFlags="None">
+        <field configurationFlags="None" name="osm_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="highway" configurationFlags="None">
+        <field configurationFlags="None" name="highway">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="waterway" configurationFlags="None">
+        <field configurationFlags="None" name="waterway">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="aerialway" configurationFlags="None">
+        <field configurationFlags="None" name="aerialway">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="barrier" configurationFlags="None">
+        <field configurationFlags="None" name="barrier">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="man_made" configurationFlags="None">
+        <field configurationFlags="None" name="man_made">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="z_order" configurationFlags="None">
+        <field configurationFlags="None" name="z_order">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="other_tags" configurationFlags="None">
+        <field configurationFlags="None" name="other_tags">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="never_show" configurationFlags="None">
+        <field configurationFlags="None" name="never_show">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label_x" configurationFlags="None">
+        <field configurationFlags="None" name="label_x">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label_y" configurationFlags="None">
+        <field configurationFlags="None" name="label_y">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label_rota" configurationFlags="None">
+        <field configurationFlags="None" name="label_rota">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="always_sho" configurationFlags="None">
+        <field configurationFlags="None" name="always_sho">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="resident_a" configurationFlags="None">
+        <field configurationFlags="None" name="resident_a">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="auxiliary_storage_labeling_show" configurationFlags="None">
+        <field configurationFlags="None" name="auxiliary_storage_labeling_show">
           <editWidget type="Hidden">
             <config>
               <Option/>
@@ -19089,100 +19861,100 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias index="0" name="" field="osm_id"/>
+        <alias index="1" name="" field="name"/>
+        <alias index="2" name="" field="highway"/>
+        <alias index="3" name="" field="waterway"/>
+        <alias index="4" name="" field="aerialway"/>
+        <alias index="5" name="" field="barrier"/>
+        <alias index="6" name="" field="man_made"/>
+        <alias index="7" name="" field="z_order"/>
+        <alias index="8" name="" field="other_tags"/>
+        <alias index="9" name="" field="never_show"/>
+        <alias index="10" name="" field="label_x"/>
+        <alias index="11" name="" field="label_y"/>
+        <alias index="12" name="" field="label_rota"/>
+        <alias index="13" name="" field="always_sho"/>
+        <alias index="14" name="" field="resident_a"/>
+        <alias index="15" name="" field="auxiliary_storage_labeling_show"/>
       </aliases>
       <defaults>
-        <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=""/>
+        <default expression="" applyOnUpdate="0" field="osm_id"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="highway"/>
+        <default expression="" applyOnUpdate="0" field="waterway"/>
+        <default expression="" applyOnUpdate="0" field="aerialway"/>
+        <default expression="" applyOnUpdate="0" field="barrier"/>
+        <default expression="" applyOnUpdate="0" field="man_made"/>
+        <default expression="" applyOnUpdate="0" field="z_order"/>
+        <default expression="" applyOnUpdate="0" field="other_tags"/>
+        <default expression="" applyOnUpdate="0" field="never_show"/>
+        <default expression="" applyOnUpdate="0" field="label_x"/>
+        <default expression="" applyOnUpdate="0" field="label_y"/>
+        <default expression="" applyOnUpdate="0" field="label_rota"/>
+        <default expression="" applyOnUpdate="0" field="always_sho"/>
+        <default expression="" applyOnUpdate="0" field="resident_a"/>
+        <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_show"/>
       </defaults>
       <constraints>
-        <constraint field="osm_id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="highway" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="waterway" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="aerialway" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="barrier" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="man_made" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="z_order" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="other_tags" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="never_show" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label_x" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label_y" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label_rota" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="always_sho" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="resident_a" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="auxiliary_storage_labeling_show" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="osm_id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="highway"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="waterway"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="aerialway"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="barrier"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="man_made"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="z_order"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="other_tags"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="never_show"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rota"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="always_sho"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="resident_a"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_show"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="osm_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="highway" desc="" exp=""/>
-        <constraint field="waterway" desc="" exp=""/>
-        <constraint field="aerialway" desc="" exp=""/>
-        <constraint field="barrier" desc="" exp=""/>
-        <constraint field="man_made" desc="" exp=""/>
-        <constraint field="z_order" desc="" exp=""/>
-        <constraint field="other_tags" desc="" exp=""/>
-        <constraint field="never_show" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rota" desc="" exp=""/>
-        <constraint field="always_sho" desc="" exp=""/>
-        <constraint field="resident_a" desc="" exp=""/>
-        <constraint field="auxiliary_storage_labeling_show" desc="" exp=""/>
+        <constraint desc="" exp="" field="osm_id"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="highway"/>
+        <constraint desc="" exp="" field="waterway"/>
+        <constraint desc="" exp="" field="aerialway"/>
+        <constraint desc="" exp="" field="barrier"/>
+        <constraint desc="" exp="" field="man_made"/>
+        <constraint desc="" exp="" field="z_order"/>
+        <constraint desc="" exp="" field="other_tags"/>
+        <constraint desc="" exp="" field="never_show"/>
+        <constraint desc="" exp="" field="label_x"/>
+        <constraint desc="" exp="" field="label_y"/>
+        <constraint desc="" exp="" field="label_rota"/>
+        <constraint desc="" exp="" field="always_sho"/>
+        <constraint desc="" exp="" field="resident_a"/>
+        <constraint desc="" exp="" field="auxiliary_storage_labeling_show"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;">
         <columns>
-          <column width="-1" hidden="0" name="osm_id" type="field"/>
-          <column width="160" hidden="0" name="name" type="field"/>
-          <column width="-1" hidden="0" name="z_order" type="field"/>
+          <column width="-1" hidden="0" type="field" name="osm_id"/>
+          <column width="160" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="z_order"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="highway" type="field"/>
-          <column width="-1" hidden="0" name="waterway" type="field"/>
-          <column width="-1" hidden="0" name="aerialway" type="field"/>
-          <column width="-1" hidden="0" name="barrier" type="field"/>
-          <column width="-1" hidden="0" name="man_made" type="field"/>
-          <column width="142" hidden="0" name="other_tags" type="field"/>
-          <column width="-1" hidden="0" name="never_show" type="field"/>
-          <column width="-1" hidden="0" name="label_x" type="field"/>
-          <column width="-1" hidden="0" name="label_y" type="field"/>
-          <column width="-1" hidden="0" name="label_rota" type="field"/>
-          <column width="-1" hidden="0" name="always_sho" type="field"/>
-          <column width="-1" hidden="0" name="resident_a" type="field"/>
-          <column width="-1" hidden="0" name="auxiliary_storage_labeling_show" type="field"/>
+          <column width="-1" hidden="0" type="field" name="highway"/>
+          <column width="-1" hidden="0" type="field" name="waterway"/>
+          <column width="-1" hidden="0" type="field" name="aerialway"/>
+          <column width="-1" hidden="0" type="field" name="barrier"/>
+          <column width="-1" hidden="0" type="field" name="man_made"/>
+          <column width="142" hidden="0" type="field" name="other_tags"/>
+          <column width="-1" hidden="0" type="field" name="never_show"/>
+          <column width="-1" hidden="0" type="field" name="label_x"/>
+          <column width="-1" hidden="0" type="field" name="label_y"/>
+          <column width="-1" hidden="0" type="field" name="label_rota"/>
+          <column width="-1" hidden="0" type="field" name="always_sho"/>
+          <column width="-1" hidden="0" type="field" name="resident_a"/>
+          <column width="-1" hidden="0" type="field" name="auxiliary_storage_labeling_show"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19250,58 +20022,58 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="z_order"/>
       </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>
@@ -19351,7 +20123,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -19416,7 +20188,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19441,58 +20213,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="231,113,72,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="231,113,72,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -19523,36 +20295,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="231,113,72,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="165,81,51,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="231,113,72,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="165,81,51,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="231,113,72,255" k="color"/>
@@ -19567,44 +20339,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="231,113,72,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="165,81,51,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="231,113,72,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="165,81,51,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -19627,16 +20399,16 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
           <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
           <rule filter="&quot;type&quot; = 'toilets'" symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
@@ -19646,35 +20418,35 @@ def my_form_open(dialog, layer, feature):
           <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="0,0,0,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="round" type="QString"/>
-                <Option name="name" value="star" 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="0,0,0,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.5" 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="7" 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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="star" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.5" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="7" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -19697,47 +20469,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '14', '7' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="color" value="0,32,80,255" type="QString"/>
-                <Option name="fixedAspectRatio" value="0" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="name" value="amenity/amenity_toilets.svg" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_width" value="0" 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 value="0" type="QString" name="angle"/>
+                <Option value="0,32,80,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="amenity/amenity_toilets.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" value="diameter" type="QString"/>
-                <Option name="size" value="7" 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 value="diameter" type="QString" name="scale_method"/>
+                <Option value="7" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,32,80,255" k="color"/>
@@ -19759,47 +20531,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="2" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="color" value="0,0,0,255" type="QString"/>
-                <Option name="fixedAspectRatio" value="0" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="name" value="../images/gym-bag.svg" 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="0,0,0,255" 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 value="0" type="QString" name="angle"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="../images/gym-bag.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" value="diameter" type="QString"/>
-                <Option name="size" value="6" 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 value="diameter" type="QString" name="scale_method"/>
+                <Option value="6" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
@@ -19821,57 +20593,57 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="fillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="3" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="color" value="125,139,143,255" type="QString"/>
-                <Option name="fixedAspectRatio" value="0" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="name" value="../images/road_closure.svg" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_width" value="0" 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 value="0" type="QString" name="angle"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="../images/road_closure.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" value="diameter" type="QString"/>
-                <Option name="size" value="6" 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 value="diameter" type="QString" name="scale_method"/>
+                <Option value="6" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="125,139,143,255" k="color"/>
@@ -19893,47 +20665,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '6' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="4" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="color" value="0,12,254,255" type="QString"/>
-                <Option name="fixedAspectRatio" value="0" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="name" value="transport/transport_bus_stop.svg" 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="255,255,255,255" type="QString"/>
-                <Option name="outline_width" value="0" 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 value="0" type="QString" name="angle"/>
+                <Option value="0,12,254,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="transport/transport_bus_stop.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="255,255,255,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" value="diameter" type="QString"/>
-                <Option name="size" value="5" 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 value="diameter" type="QString" name="scale_method"/>
+                <Option value="5" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,12,254,255" k="color"/>
@@ -19956,18 +20728,18 @@ def my_form_open(dialog, layer, feature):
               <effect enabled="0" type="effectStack">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option name="blend_mode" value="13" type="QString"/>
-                    <Option name="blur_level" value="2.645" type="QString"/>
-                    <Option name="blur_unit" value="MM" type="QString"/>
-                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="draw_mode" value="2" type="QString"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="offset_angle" value="135" type="QString"/>
-                    <Option name="offset_distance" value="2" type="QString"/>
-                    <Option name="offset_unit" value="MM" type="QString"/>
-                    <Option name="offset_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="opacity" value="1" type="QString"/>
+                    <Option value="13" type="QString" name="blend_mode"/>
+                    <Option value="2.645" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="135" type="QString" name="offset_angle"/>
+                    <Option value="2" type="QString" name="offset_distance"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
+                    <Option value="1" type="QString" name="opacity"/>
                   </Option>
                   <prop v="13" k="blend_mode"/>
                   <prop v="2.645" k="blur_level"/>
@@ -19984,24 +20756,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option name="blend_mode" value="0" type="QString"/>
-                    <Option name="blur_level" value="0.7935" type="QString"/>
-                    <Option name="blur_unit" value="MM" type="QString"/>
-                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color1" value="0,0,255,255" type="QString"/>
-                    <Option name="color2" value="0,255,0,255" type="QString"/>
-                    <Option name="color_type" value="0" type="QString"/>
-                    <Option name="direction" value="ccw" type="QString"/>
-                    <Option name="discrete" value="0" type="QString"/>
-                    <Option name="draw_mode" value="2" type="QString"/>
-                    <Option name="enabled" value="1" type="QString"/>
-                    <Option name="opacity" value="0.5" type="QString"/>
-                    <Option name="rampType" value="gradient" type="QString"/>
-                    <Option name="single_color" value="255,255,255,255" type="QString"/>
-                    <Option name="spec" value="rgb" type="QString"/>
-                    <Option name="spread" value="2" type="QString"/>
-                    <Option name="spread_unit" value="MM" type="QString"/>
-                    <Option name="spread_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option value="0" type="QString" name="blend_mode"/>
+                    <Option value="0.7935" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,255,255" type="QString" name="color1"/>
+                    <Option value="0,255,0,255" type="QString" name="color2"/>
+                    <Option value="0" type="QString" name="color_type"/>
+                    <Option value="ccw" type="QString" name="direction"/>
+                    <Option value="0" type="QString" name="discrete"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="1" type="QString" name="enabled"/>
+                    <Option value="0.5" type="QString" name="opacity"/>
+                    <Option value="gradient" type="QString" name="rampType"/>
+                    <Option value="255,255,255,255" type="QString" name="single_color"/>
+                    <Option value="rgb" type="QString" name="spec"/>
+                    <Option value="2" type="QString" name="spread"/>
+                    <Option value="MM" type="QString" name="spread_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="0.7935" k="blur_level"/>
@@ -20024,10 +20796,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option name="blend_mode" value="0" type="QString"/>
-                    <Option name="draw_mode" value="2" type="QString"/>
-                    <Option name="enabled" value="1" type="QString"/>
-                    <Option name="opacity" value="1" type="QString"/>
+                    <Option value="0" type="QString" name="blend_mode"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="1" type="QString" name="enabled"/>
+                    <Option value="1" type="QString" name="opacity"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="2" k="draw_mode"/>
@@ -20036,18 +20808,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option name="blend_mode" value="13" type="QString"/>
-                    <Option name="blur_level" value="2.645" type="QString"/>
-                    <Option name="blur_unit" value="MM" type="QString"/>
-                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="draw_mode" value="2" type="QString"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="offset_angle" value="135" type="QString"/>
-                    <Option name="offset_distance" value="2" type="QString"/>
-                    <Option name="offset_unit" value="MM" type="QString"/>
-                    <Option name="offset_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="opacity" value="1" type="QString"/>
+                    <Option value="13" type="QString" name="blend_mode"/>
+                    <Option value="2.645" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="135" type="QString" name="offset_angle"/>
+                    <Option value="2" type="QString" name="offset_distance"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
+                    <Option value="1" type="QString" name="opacity"/>
                   </Option>
                   <prop v="13" k="blend_mode"/>
                   <prop v="2.645" k="blur_level"/>
@@ -20064,24 +20836,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option name="blend_mode" value="0" type="QString"/>
-                    <Option name="blur_level" value="0.7935" type="QString"/>
-                    <Option name="blur_unit" value="MM" type="QString"/>
-                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color1" value="0,0,255,255" type="QString"/>
-                    <Option name="color2" value="0,255,0,255" type="QString"/>
-                    <Option name="color_type" value="0" type="QString"/>
-                    <Option name="direction" value="ccw" type="QString"/>
-                    <Option name="discrete" value="0" type="QString"/>
-                    <Option name="draw_mode" value="2" type="QString"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="opacity" value="0.5" type="QString"/>
-                    <Option name="rampType" value="gradient" type="QString"/>
-                    <Option name="single_color" value="255,255,255,255" type="QString"/>
-                    <Option name="spec" value="rgb" type="QString"/>
-                    <Option name="spread" value="2" type="QString"/>
-                    <Option name="spread_unit" value="MM" type="QString"/>
-                    <Option name="spread_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option value="0" type="QString" name="blend_mode"/>
+                    <Option value="0.7935" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,255,255" type="QString" name="color1"/>
+                    <Option value="0,255,0,255" type="QString" name="color2"/>
+                    <Option value="0" type="QString" name="color_type"/>
+                    <Option value="ccw" type="QString" name="direction"/>
+                    <Option value="0" type="QString" name="discrete"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="0.5" type="QString" name="opacity"/>
+                    <Option value="gradient" type="QString" name="rampType"/>
+                    <Option value="255,255,255,255" type="QString" name="single_color"/>
+                    <Option value="rgb" type="QString" name="spec"/>
+                    <Option value="2" type="QString" name="spread"/>
+                    <Option value="MM" type="QString" name="spread_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="0.7935" k="blur_level"/>
@@ -20105,47 +20877,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="5" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="5" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="color" value="43,153,41,255" type="QString"/>
-                <Option name="fixedAspectRatio" value="0" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="name" value="transport/amenity=parking.svg" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_width" value="0" 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 value="0" type="QString" name="angle"/>
+                <Option value="43,153,41,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="transport/amenity=parking.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" value="diameter" type="QString"/>
-                <Option name="size" value="6" 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 value="diameter" type="QString" name="scale_method"/>
+                <Option value="6" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="43,153,41,255" k="color"/>
@@ -20167,15 +20939,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20184,32 +20956,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="name" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="63" fieldName="name" textOpacity="0.90000000000000002" isExpression="0" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.80000000000000004" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="2" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="1" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="2" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.69999999999999996" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="2" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferSize="2" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="2" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="0.69999999999999996" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="1">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -20224,148 +20996,148 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelDistance" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="expression" value="if( @map_scale &lt; 7000, '5', '3' )" type="QString"/>
-                    <Option name="type" value="3" type="int"/>
+                <Option value="" type="QString" name="name"/>
+                <Option type="Map" name="properties">
+                  <Option type="Map" name="LabelDistance">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
-                  <Option name="OffsetQuad" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="expression" value="2" type="QString"/>
-                    <Option name="type" value="3" type="int"/>
+                  <Option type="Map" name="OffsetQuad">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="2" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
-                  <Option name="Size" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="expression" value="if( @map_scale &lt; 7000, '14', '10' )" type="QString"/>
-                    <Option name="type" value="3" type="int"/>
+                  <Option type="Map" name="Size">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
                 </Option>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-          <placement priority="10" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="2" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="3" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="2" dist="3" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="10" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+          <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="2" offsetType="0" placement="0" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="3" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="2" offsetUnits="MM" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="3" geometryGeneratorType="PointGeometry"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1.8" minFeatureSize="0" upsidedownLabels="0" zIndex="10" fontLimitPixelSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="LabelDistance" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="if( @map_scale &lt; 7000, '5', '3' )" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="LabelDistance">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="OffsetQuad" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="2" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="OffsetQuad">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="2" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="if( @map_scale &lt; 7000, '14', '10' )" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Size">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-              <Option name="blendMode" value="0" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" value="" type="QString"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" value="false" type="bool"/>
-              <Option name="enabled" value="0" type="QString"/>
-              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-              <Option name="minLength" value="0" type="double"/>
-              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="minLengthUnit" value="MM" type="QString"/>
-              <Option name="offsetFromAnchor" value="0" type="double"/>
-              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-              <Option name="offsetFromLabel" value="0" type="double"/>
-              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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" value="id" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -20396,9 +21168,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20406,12 +21178,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -20422,28 +21194,28 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -20452,40 +21224,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="name"/>
+        <alias index="3" name="" field="distance"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="name" type="field"/>
-          <column width="-1" hidden="0" name="distance" type="field"/>
+          <column width="-1" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="distance"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20523,10 +21295,10 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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/>
@@ -20534,7 +21306,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -20607,58 +21379,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="152,125,183,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="152,125,183,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -20689,36 +21461,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="152,125,183,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="109,89,131,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="152,125,183,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="109,89,131,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="152,125,183,255" k="color"/>
@@ -20733,44 +21505,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="152,125,183,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="109,89,131,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="152,125,183,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="109,89,131,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -20793,42 +21565,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="LinePatternFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="LinePatternFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="135" type="QString"/>
-                <Option name="clip_mode" value="during_render" type="QString"/>
-                <Option name="color" value="211,134,33,255" type="QString"/>
-                <Option name="coordinate_reference" value="feature" type="QString"/>
-                <Option name="distance" value="2" type="QString"/>
-                <Option name="distance_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="distance_unit" value="MM" type="QString"/>
-                <Option name="line_width" value="0.26" type="QString"/>
-                <Option name="line_width_map_unit_scale" value="3x:0,0,0,0,0,0" 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="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 value="135" type="QString" name="angle"/>
+                <Option value="during_render" type="QString" name="clip_mode"/>
+                <Option value="211,134,33,255" type="QString" name="color"/>
+                <Option value="feature" type="QString" name="coordinate_reference"/>
+                <Option value="2" type="QString" name="distance"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="distance_map_unit_scale"/>
+                <Option value="MM" type="QString" name="distance_unit"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="line_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
               </Option>
               <prop v="135" k="angle"/>
               <prop v="during_render" k="clip_mode"/>
@@ -20847,48 +21619,48 @@ def my_form_open(dialog, layer, feature):
               <prop v="MM" k="outline_width_unit"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="@0@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                   <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="211,134,33,255" type="QString"/>
-                    <Option name="line_style" value="solid" type="QString"/>
-                    <Option name="line_width" value="0.3" 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 value="0" type="QString" name="align_dash_pattern"/>
+                    <Option value="square" type="QString" name="capstyle"/>
+                    <Option value="5;2" type="QString" name="customdash"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="customdash_unit"/>
+                    <Option value="0" type="QString" name="dash_pattern_offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                    <Option value="0" type="QString" name="draw_inside_polygon"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="211,134,33,255" type="QString" name="line_color"/>
+                    <Option value="solid" type="QString" name="line_style"/>
+                    <Option value="0.3" type="QString" name="line_width"/>
+                    <Option value="MM" type="QString" name="line_width_unit"/>
+                    <Option value="0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0" type="QString" name="ring_filter"/>
+                    <Option value="0" type="QString" name="trim_distance_end"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                    <Option value="0" type="QString" name="trim_distance_start"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                    <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                    <Option value="0" type="QString" name="use_custom_dash"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                   </Option>
                   <prop v="0" k="align_dash_pattern"/>
                   <prop v="square" k="capstyle"/>
@@ -20919,27 +21691,27 @@ 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 value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="211,134,33,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="0,0,0,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.46" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="no" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="211,134,33,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.46" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="no" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="211,134,33,255" k="color"/>
@@ -20954,9 +21726,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20967,60 +21739,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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" value="id" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -21051,9 +21823,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21061,12 +21833,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="1" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="1" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -21077,7 +21849,7 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="FID" configurationFlags="None">
+        <field configurationFlags="None" name="FID">
           <editWidget type="">
             <config>
               <Option/>
@@ -21086,25 +21858,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias index="0" name="" field="FID"/>
       </aliases>
       <defaults>
-        <default field="FID" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="FID"/>
       </defaults>
       <constraints>
-        <constraint field="FID" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="FID"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" desc="" exp=""/>
+        <constraint desc="" exp="" field="FID"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="431" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="431" hidden="0" type="field" name="type"/>
           <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
@@ -21141,8 +21913,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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/>
@@ -21150,7 +21922,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -21215,7 +21987,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21240,58 +22012,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="190,207,80,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="190,207,80,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21322,36 +22094,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="190,207,80,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="136,148,57,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="190,207,80,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,148,57,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,207,80,255" k="color"/>
@@ -21366,44 +22138,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="190,207,80,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="136,148,57,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="190,207,80,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,148,57,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -21426,16 +22198,16 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
           <rule filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
           <rule filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
@@ -21444,43 +22216,43 @@ def my_form_open(dialog, layer, feature):
           <rule filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="0,255,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.75" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,255,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21511,50 +22283,50 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="2" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="2" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -21574,40 +22346,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="255,255,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,255,0,255" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0.5" 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="1" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,255,0,255" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0.5" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="1" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -21630,52 +22402,52 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="2" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="square" type="QString"/>
-                <Option name="customdash" value="2;1;1;1" 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="0,255,0,255" type="QString"/>
-                <Option name="line_style" value="dash dot dot" type="QString"/>
-                <Option name="line_width" value="0.75" 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="1" type="QString"/>
-                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="2;1;1;1" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,255,0,255" type="QString" name="line_color"/>
+                <Option value="dash dot dot" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21706,41 +22478,41 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="250" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MapUnit" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="25" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MapUnit" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="25" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -21760,46 +22532,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="enabled">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@2@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@2@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,255,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="35,35,35,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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.5" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,255,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3.5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -21822,58 +22594,58 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="outlineStyle">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="3" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="square" type="QString"/>
-                <Option name="customdash" value="3;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="0,255,0,255" type="QString"/>
-                <Option name="line_style" value="dash" type="QString"/>
-                <Option name="line_width" value="0.75" 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="1" type="QString"/>
-                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="3;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,255,0,255" type="QString" name="line_color"/>
+                <Option value="dash" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21904,41 +22676,41 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="250" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MapUnit" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="25" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MapUnit" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="25" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -21958,46 +22730,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="enabled">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@3@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@3@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,255,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="35,35,35,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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.5" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,255,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3.5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -22020,58 +22792,58 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="outlineStyle">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="4" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="255,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.75" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22102,20 +22874,20 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22124,32 +22896,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="times" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="9" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" fieldName="times" textOpacity="1" isExpression="0" namedStyle="Regular" fontSize="9" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -22164,116 +22936,116 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="4294967295"/>
-          <placement priority="5" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="4294967295"/>
+          <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="0" xOffset="0" offsetType="0" placement="2" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="PreventOverlap" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-              <Option name="blendMode" value="0" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" value="" type="QString"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" value="false" type="bool"/>
-              <Option name="enabled" value="0" type="QString"/>
-              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-              <Option name="minLength" value="0" type="double"/>
-              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="minLengthUnit" value="MM" type="QString"/>
-              <Option name="offsetFromAnchor" value="0" type="double"/>
-              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-              <Option name="offsetFromLabel" value="0" type="double"/>
-              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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" value="id" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -22304,9 +23076,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22314,12 +23086,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -22330,28 +23102,28 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="status" configurationFlags="None">
+        <field configurationFlags="None" name="status">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="times" configurationFlags="None">
+        <field configurationFlags="None" name="times">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -22360,40 +23132,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="status"/>
+        <alias index="3" name="" field="times"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
-        <default field="times" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="status"/>
+        <default expression="" applyOnUpdate="0" field="times"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="status" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="times" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="times"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
-        <constraint field="times" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="status"/>
+        <constraint desc="" exp="" field="times"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="202" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="202" hidden="0" type="field" name="type"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="status" type="field"/>
-          <column width="-1" hidden="0" name="times" type="field"/>
+          <column width="-1" hidden="0" type="field" name="status"/>
+          <column width="-1" hidden="0" type="field" name="times"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22431,10 +23203,10 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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/>
@@ -22442,7 +23214,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37569522835420344</xmin>
         <ymin>-33.95582126985814853</ymin>
@@ -22507,7 +23279,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -22532,58 +23304,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="225,89,137,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="225,89,137,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22614,36 +23386,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="225,89,137,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="161,64,98,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="161,64,98,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -22658,44 +23430,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="225,89,137,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="161,64,98,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="161,64,98,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -22718,54 +23490,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{0a67d1c6-0289-43d0-8cea-e94d16054c5d}">
-          <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="{c7589943-f7c2-4796-a405-6a8c9e18ff15}">
+          <rule description="Active routes" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{c7589943-f7c2-4796-a405-6a8c9e18ff15}">
             <settings calloutType="simple">
-              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="213,180,60,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="213,180,60,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -22788,34 +23560,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,0,0,255" type="QString"/>
-                        <Option name="joinstyle" value="round" 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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="1" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,0,0,255" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -22830,138 +23602,138 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                            <Option type="Map" name="outlineColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="3" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <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="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="field" value="quadrant" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="quadrant" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="field" value="rotation" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="rotation" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{1a82228c-f408-4c3d-bb8d-158713c47604}">
+          <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1a82228c-f408-4c3d-bb8d-158713c47604}">
             <settings calloutType="simple">
-              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="213,180,60,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="213,180,60,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -22984,34 +23756,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,0,0,255" type="QString"/>
-                        <Option name="joinstyle" value="round" 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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="1" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,0,0,255" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -23026,131 +23798,131 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                            <Option type="Map" name="outlineColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="3" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <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="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="field" value="quadrant" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="quadrant" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="field" value="rotation" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="rotation" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" description="List for legends" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}">
-            <rule filter="&quot;Source&quot; = '21KM'" active="0" description="21KM" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}">
+          <rule description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}">
+            <rule description="21KM" filter="&quot;Source&quot; = '21KM'" active="0" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}">
               <settings calloutType="simple">
-                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+                <text-style fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="210,32,39,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                  <background shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="128" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                    <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                          <Option name="color" value="210,32,39,255" type="QString"/>
-                          <Option name="joinstyle" value="round" 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="210,32,39,255" type="QString"/>
-                          <Option name="outline_style" value="solid" type="QString"/>
-                          <Option name="outline_width" value="1" type="QString"/>
-                          <Option name="outline_width_unit" value="MM" type="QString"/>
-                          <Option name="style" value="solid" type="QString"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="210,32,39,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="210,32,39,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="210,32,39,255" k="color"/>
@@ -23165,130 +23937,130 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" value="" type="QString"/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" value="collection" type="QString"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="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="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                        <Option type="Map" name="PositionY">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option name="field" value="quadrant" type="QString"/>
-                          <Option name="type" value="2" type="int"/>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="quadrant" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="field" value="rotation" type="QString"/>
-                          <Option name="type" value="2" type="int"/>
+                        <Option type="Map" name="Rotation">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="rotation" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+                <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="3" offsetUnits="MapUnit" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
                 <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="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                    <Option name="blendMode" value="0" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" value="" type="QString"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" value="false" type="bool"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                    <Option name="minLength" value="0" type="double"/>
-                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="minLengthUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromAnchor" value="0" type="double"/>
-                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromLabel" value="0" type="double"/>
-                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" active="0" description="10KM" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}">
+            <rule description="10KM" filter="&quot;Source&quot; = '10KM'" active="0" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}">
               <settings calloutType="simple">
-                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+                <text-style fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="103,34,144,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                  <background shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="128" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                    <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                          <Option name="color" value="103,34,144,255" type="QString"/>
-                          <Option name="joinstyle" value="round" 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="103,34,144,255" type="QString"/>
-                          <Option name="outline_style" value="solid" type="QString"/>
-                          <Option name="outline_width" value="1" type="QString"/>
-                          <Option name="outline_width_unit" value="MM" type="QString"/>
-                          <Option name="style" value="solid" type="QString"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="103,34,144,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="103,34,144,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="103,34,144,255" k="color"/>
@@ -23303,130 +24075,130 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" value="" type="QString"/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" value="collection" type="QString"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="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="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                        <Option type="Map" name="PositionY">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option name="field" value="quadrant" type="QString"/>
-                          <Option name="type" value="2" type="int"/>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="quadrant" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="field" value="rotation" type="QString"/>
-                          <Option name="type" value="2" type="int"/>
+                        <Option type="Map" name="Rotation">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="rotation" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+                <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
                 <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="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                    <Option name="blendMode" value="0" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" value="" type="QString"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" value="false" type="bool"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                    <Option name="minLength" value="0" type="double"/>
-                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="minLengthUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromAnchor" value="0" type="double"/>
-                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromLabel" value="0" type="double"/>
-                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" active="0" description="5KM" key="{693188a6-ae99-4fd2-859f-1606793dda66}">
+            <rule description="5KM" filter="&quot;Source&quot; = '5KM'" active="0" key="{693188a6-ae99-4fd2-859f-1606793dda66}">
               <settings calloutType="simple">
-                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+                <text-style fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                  <background shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="128" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                    <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                          <Option name="color" value="145,211,55,255" type="QString"/>
-                          <Option name="joinstyle" value="round" 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="145,211,55,255" type="QString"/>
-                          <Option name="outline_style" value="solid" type="QString"/>
-                          <Option name="outline_width" value="1" type="QString"/>
-                          <Option name="outline_width_unit" value="MM" type="QString"/>
-                          <Option name="style" value="solid" type="QString"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="145,211,55,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="145,211,55,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="145,211,55,255" k="color"/>
@@ -23441,138 +24213,138 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" value="" type="QString"/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" value="collection" type="QString"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="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="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                        <Option type="Map" name="PositionY">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option name="field" value="quadrant" type="QString"/>
-                          <Option name="type" value="2" type="int"/>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="quadrant" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="field" value="rotation" type="QString"/>
-                          <Option name="type" value="2" type="int"/>
+                        <Option type="Map" name="Rotation">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="rotation" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+                <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
                 <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="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                    <Option name="blendMode" value="0" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" value="" type="QString"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" value="false" type="bool"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                    <Option name="minLength" value="0" type="double"/>
-                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="minLengthUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromAnchor" value="0" type="double"/>
-                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromLabel" value="0" type="double"/>
-                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = 'Trail'" active="0" description="Trail" key="{ba58e108-c24a-410e-9584-a7819af049ef}">
+            <rule description="Trail" filter="&quot;Source&quot; = 'Trail'" active="0" key="{ba58e108-c24a-410e-9584-a7819af049ef}">
               <settings calloutType="simple">
-                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+                <text-style fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                    <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                  <background shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                    <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                      <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                         <Option type="Map">
-                          <Option name="angle" value="0" type="QString"/>
-                          <Option name="cap_style" value="square" type="QString"/>
-                          <Option name="color" value="133,182,111,255" type="QString"/>
-                          <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                          <Option name="joinstyle" value="bevel" type="QString"/>
-                          <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                          <Option name="outline_style" value="solid" type="QString"/>
-                          <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                          <Option value="square" type="QString" name="cap_style"/>
+                          <Option value="133,182,111,255" type="QString" name="color"/>
+                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                          <Option value="bevel" type="QString" name="joinstyle"/>
+                          <Option value="circle" type="QString" name="name"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="0" type="QString" name="outline_width"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="diameter" type="QString" name="scale_method"/>
+                          <Option value="2" type="QString" name="size"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="size_unit"/>
+                          <Option value="1" type="QString" name="vertical_anchor_point"/>
                         </Option>
                         <prop v="0" k="angle"/>
                         <prop v="square" k="cap_style"/>
@@ -23595,34 +24367,34 @@ def my_form_open(dialog, layer, feature):
                         <prop v="1" k="vertical_anchor_point"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" value="" type="QString"/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" value="collection" type="QString"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                    <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                          <Option name="color" value="0,72,255,255" type="QString"/>
-                          <Option name="joinstyle" value="round" 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="0,72,255,255" type="QString"/>
-                          <Option name="outline_style" value="solid" type="QString"/>
-                          <Option name="outline_width" value="1" type="QString"/>
-                          <Option name="outline_width_unit" value="MM" type="QString"/>
-                          <Option name="style" value="solid" type="QString"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="0,72,255,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="0,72,255,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="0,72,255,255" k="color"/>
@@ -23637,77 +24409,77 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" value="" type="QString"/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" value="collection" type="QString"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+                <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
                 <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="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                    <Option name="blendMode" value="0" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" value="" type="QString"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" value="false" type="bool"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                    <Option name="minLength" value="0" type="double"/>
-                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="minLengthUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromAnchor" value="0" type="double"/>
-                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromLabel" value="0" type="double"/>
-                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
@@ -23717,62 +24489,62 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" value="no_action" 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="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -23803,9 +24575,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23813,12 +24585,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -23829,141 +24601,141 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="None">
+        <field configurationFlags="None" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="None">
+        <field configurationFlags="None" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="None">
+        <field configurationFlags="None" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Sort" configurationFlags="None">
+        <field configurationFlags="None" name="Sort">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="length_km" configurationFlags="None">
+        <field configurationFlags="None" name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="org_fid" configurationFlags="None">
+        <field configurationFlags="None" name="org_fid">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="quadrant" configurationFlags="None">
+        <field configurationFlags="None" name="quadrant">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -23972,95 +24744,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
-        <alias field="org_fid" index="12" name=""/>
-        <alias field="distance" index="13" name=""/>
-        <alias field="quadrant" index="14" name=""/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="descriptio"/>
+        <alias index="2" name="" field="timestamp"/>
+        <alias index="3" name="" field="begin"/>
+        <alias index="4" name="" field="end"/>
+        <alias index="5" name="" field="Distance"/>
+        <alias index="6" name="" field="RouteLen"/>
+        <alias index="7" name="" field="Source"/>
+        <alias index="8" name="" field="Sort"/>
+        <alias index="9" name="" field="day"/>
+        <alias index="10" name="" field="length_km"/>
+        <alias index="11" name="" field="length_m"/>
+        <alias index="12" name="" field="org_fid"/>
+        <alias index="13" name="" field="distance"/>
+        <alias index="14" name="" field="quadrant"/>
       </aliases>
       <defaults>
-        <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="Distance" applyOnUpdate="0" expression=""/>
-        <default field="RouteLen" applyOnUpdate="0" expression=""/>
-        <default field="Source" applyOnUpdate="0" expression=""/>
-        <default field="Sort" applyOnUpdate="0" expression=""/>
-        <default field="day" 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=""/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="descriptio"/>
+        <default expression="" applyOnUpdate="0" field="timestamp"/>
+        <default expression="" applyOnUpdate="0" field="begin"/>
+        <default expression="" applyOnUpdate="0" field="end"/>
+        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default expression="" applyOnUpdate="0" field="RouteLen"/>
+        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default expression="" applyOnUpdate="0" field="Sort"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="length_km"/>
+        <default expression="" applyOnUpdate="0" field="length_m"/>
+        <default expression="" applyOnUpdate="0" field="org_fid"/>
+        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default expression="" applyOnUpdate="0" field="quadrant"/>
       </defaults>
       <constraints>
-        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="descriptio" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="timestamp" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="begin" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="end" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="RouteLen" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Source" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Sort" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="length_km" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="length_m" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="org_fid" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="quadrant" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descriptio"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="timestamp"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="begin"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="end"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Distance"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Source"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Sort"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length_km"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length_m"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="org_fid"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="distance"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="quadrant"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="Sort" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
-        <constraint field="org_fid" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="quadrant" desc="" exp=""/>
+        <constraint desc="" exp="" field="Name"/>
+        <constraint desc="" exp="" field="descriptio"/>
+        <constraint desc="" exp="" field="timestamp"/>
+        <constraint desc="" exp="" field="begin"/>
+        <constraint desc="" exp="" field="end"/>
+        <constraint desc="" exp="" field="Distance"/>
+        <constraint desc="" exp="" field="RouteLen"/>
+        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" exp="" field="Sort"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="length_km"/>
+        <constraint desc="" exp="" field="length_m"/>
+        <constraint desc="" exp="" field="org_fid"/>
+        <constraint desc="" exp="" field="distance"/>
+        <constraint desc="" exp="" field="quadrant"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;">
         <columns>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="org_fid" type="field"/>
-          <column width="-1" hidden="0" name="distance" type="field"/>
-          <column width="-1" hidden="0" name="Name" type="field"/>
-          <column width="-1" hidden="0" name="Source" type="field"/>
-          <column width="-1" hidden="0" name="RouteLen" type="field"/>
-          <column width="-1" hidden="0" name="descriptio" type="field"/>
-          <column width="-1" hidden="0" name="timestamp" type="field"/>
-          <column width="-1" hidden="0" name="begin" type="field"/>
-          <column width="-1" hidden="0" name="end" type="field"/>
-          <column width="-1" hidden="0" name="Distance" type="field"/>
-          <column width="-1" hidden="0" name="length_km" type="field"/>
-          <column width="-1" hidden="0" name="Sort" type="field"/>
-          <column width="-1" hidden="0" name="quadrant" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="-1" hidden="0" name="length_m" type="field"/>
+          <column width="-1" hidden="0" type="field" name="org_fid"/>
+          <column width="-1" hidden="0" type="field" name="distance"/>
+          <column width="-1" hidden="0" type="field" name="Name"/>
+          <column width="-1" hidden="0" type="field" name="Source"/>
+          <column width="-1" hidden="0" type="field" name="RouteLen"/>
+          <column width="-1" hidden="0" type="field" name="descriptio"/>
+          <column width="-1" hidden="0" type="field" name="timestamp"/>
+          <column width="-1" hidden="0" type="field" name="begin"/>
+          <column width="-1" hidden="0" type="field" name="end"/>
+          <column width="-1" hidden="0" type="field" name="Distance"/>
+          <column width="-1" hidden="0" type="field" name="length_km"/>
+          <column width="-1" hidden="0" type="field" name="Sort"/>
+          <column width="-1" hidden="0" type="field" name="quadrant"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="-1" hidden="0" type="field" name="length_m"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24109,45 +24881,45 @@ def my_form_open(dialog, layer, feature):
         <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"/>
+        <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>Text</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -24220,58 +24992,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="229,182,54,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="229,182,54,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -24302,36 +25074,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="229,182,54,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="164,130,39,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="229,182,54,255" k="color"/>
@@ -24346,44 +25118,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="229,182,54,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="164,130,39,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -24406,38 +25178,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="114,155,111,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -24452,9 +25224,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24465,10 +25237,10 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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" value="&quot;id&quot;" type="QString"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -24483,21 +25255,21 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="area" configurationFlags="None">
+        <field configurationFlags="None" name="area">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="rotation" configurationFlags="None">
+        <field configurationFlags="None" name="rotation">
           <editWidget type="">
             <config>
               <Option/>
@@ -24506,34 +25278,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="area"/>
+        <alias index="2" name="" field="rotation"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="area" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="area"/>
+        <default expression="" applyOnUpdate="0" field="rotation"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="area" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="rotation" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="area"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="area" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="area"/>
+        <constraint desc="" exp="" field="rotation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="area" type="field"/>
-          <column width="-1" hidden="0" name="rotation" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="area"/>
+          <column width="-1" hidden="0" type="field" name="rotation"/>
           <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
@@ -24557,7 +25329,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -24622,7 +25394,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -24647,58 +25419,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="196,60,57,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="196,60,57,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -24729,36 +25501,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="196,60,57,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="140,43,41,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="196,60,57,255" k="color"/>
@@ -24773,44 +25545,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="196,60,57,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="140,43,41,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -24833,49 +25605,49 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule checkstate="0" symbol="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule symbol="0" checkstate="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="1" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="1" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="0,0,0,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="name" value="circle" 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="35,35,35,0" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0" 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="0.5" 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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,0" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="0.5" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -24898,20 +25670,20 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="fillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24923,64 +25695,64 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="StringList">
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="StringList" name="dualview/previewExpressions">
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -25011,9 +25783,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25021,12 +25793,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -25037,100 +25809,100 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="length_km" configurationFlags="None">
+        <field configurationFlags="None" name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="org_fid" configurationFlags="None">
+        <field configurationFlags="None" name="org_fid">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="first_runn" configurationFlags="None">
+        <field configurationFlags="None" name="first_runn">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="last_runne" configurationFlags="None">
+        <field configurationFlags="None" name="last_runne">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -25139,85 +25911,85 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="RouteLen" index="5" name=""/>
-        <alias field="Source" index="6" name=""/>
-        <alias field="length_m" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="org_fid" index="9" name=""/>
-        <alias field="distance" index="10" name=""/>
-        <alias field="first_runn" index="11" name=""/>
-        <alias field="last_runne" index="12" name=""/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="descriptio"/>
+        <alias index="2" name="" field="timestamp"/>
+        <alias index="3" name="" field="begin"/>
+        <alias index="4" name="" field="end"/>
+        <alias index="5" name="" field="RouteLen"/>
+        <alias index="6" name="" field="Source"/>
+        <alias index="7" name="" field="length_m"/>
+        <alias index="8" name="" field="length_km"/>
+        <alias index="9" name="" field="org_fid"/>
+        <alias index="10" name="" field="distance"/>
+        <alias index="11" name="" field="first_runn"/>
+        <alias index="12" name="" field="last_runne"/>
       </aliases>
       <defaults>
-        <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=""/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="descriptio"/>
+        <default expression="" applyOnUpdate="0" field="timestamp"/>
+        <default expression="" applyOnUpdate="0" field="begin"/>
+        <default expression="" applyOnUpdate="0" field="end"/>
+        <default expression="" applyOnUpdate="0" field="RouteLen"/>
+        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default expression="" applyOnUpdate="0" field="length_m"/>
+        <default expression="" applyOnUpdate="0" field="length_km"/>
+        <default expression="" applyOnUpdate="0" field="org_fid"/>
+        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default expression="" applyOnUpdate="0" field="first_runn"/>
+        <default expression="" applyOnUpdate="0" field="last_runne"/>
       </defaults>
       <constraints>
-        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="descriptio" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="timestamp" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="begin" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="end" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="RouteLen" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Source" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="length_m" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="length_km" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="org_fid" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="first_runn" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="last_runne" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descriptio"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="timestamp"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="begin"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="end"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Source"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length_m"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length_km"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="org_fid"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="distance"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="first_runn"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="last_runne"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="org_fid" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="first_runn" desc="" exp=""/>
-        <constraint field="last_runne" desc="" exp=""/>
+        <constraint desc="" exp="" field="Name"/>
+        <constraint desc="" exp="" field="descriptio"/>
+        <constraint desc="" exp="" field="timestamp"/>
+        <constraint desc="" exp="" field="begin"/>
+        <constraint desc="" exp="" field="end"/>
+        <constraint desc="" exp="" field="RouteLen"/>
+        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" exp="" field="length_m"/>
+        <constraint desc="" exp="" field="length_km"/>
+        <constraint desc="" exp="" field="org_fid"/>
+        <constraint desc="" exp="" field="distance"/>
+        <constraint desc="" exp="" field="first_runn"/>
+        <constraint desc="" exp="" field="last_runne"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;">
         <columns>
-          <column width="179" hidden="0" name="begin" type="field"/>
-          <column width="-1" hidden="0" name="RouteLen" type="field"/>
-          <column width="-1" hidden="0" name="Source" type="field"/>
+          <column width="179" hidden="0" type="field" name="begin"/>
+          <column width="-1" hidden="0" type="field" name="RouteLen"/>
+          <column width="-1" hidden="0" type="field" name="Source"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="Name" type="field"/>
-          <column width="-1" hidden="0" name="length_m" type="field"/>
-          <column width="-1" hidden="0" name="length_km" type="field"/>
-          <column width="-1" hidden="0" name="org_fid" type="field"/>
-          <column width="-1" hidden="0" name="first_runn" type="field"/>
-          <column width="-1" hidden="0" name="last_runne" type="field"/>
-          <column width="-1" hidden="0" name="descriptio" type="field"/>
-          <column width="-1" hidden="0" name="timestamp" type="field"/>
-          <column width="-1" hidden="0" name="end" type="field"/>
-          <column width="-1" hidden="0" name="distance" type="field"/>
+          <column width="-1" hidden="0" type="field" name="Name"/>
+          <column width="-1" hidden="0" type="field" name="length_m"/>
+          <column width="-1" hidden="0" type="field" name="length_km"/>
+          <column width="-1" hidden="0" type="field" name="org_fid"/>
+          <column width="-1" hidden="0" type="field" name="first_runn"/>
+          <column width="-1" hidden="0" type="field" name="last_runne"/>
+          <column width="-1" hidden="0" type="field" name="descriptio"/>
+          <column width="-1" hidden="0" type="field" name="timestamp"/>
+          <column width="-1" hidden="0" type="field" name="end"/>
+          <column width="-1" hidden="0" type="field" name="distance"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25276,31 +26048,31 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="timestamp"/>
       </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/>
@@ -25308,7 +26080,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -25381,58 +26153,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="190,178,151,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="190,178,151,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -25463,36 +26235,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="190,178,151,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="136,127,108,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,178,151,255" k="color"/>
@@ -25507,44 +26279,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="190,178,151,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="136,127,108,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -25567,58 +26339,58 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
           <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
           <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="123,211,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="1" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="123,211,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -25649,50 +26421,50 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="flat" type="QString"/>
-                <Option name="customdash" value="4;1;1;1" 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="103,34,144,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="1.25" 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="1" type="QString"/>
-                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="4;1;1;1" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1.25" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -25723,30 +26495,30 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -25766,33 +26538,33 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="5" 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 value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -25808,32 +26580,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@1@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@1@1@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="103,34,144,255" type="QString"/>
-                        <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -25848,9 +26620,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -25863,60 +26635,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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" value="id" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -25947,9 +26719,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25957,12 +26729,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -25973,14 +26745,14 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -25989,30 +26761,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26048,8 +26820,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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/>
@@ -26057,7 +26829,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -26130,58 +26902,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="145,82,45,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,82,45,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26212,36 +26984,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="145,82,45,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="104,59,32,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="145,82,45,255" k="color"/>
@@ -26256,44 +27028,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="145,82,45,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="104,59,32,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -26316,44 +27088,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="label" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="15" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="63" fieldName="label" textOpacity="1" isExpression="0" namedStyle="Semibold" fontSize="15" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -26368,115 +27140,115 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-          <placement priority="5" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+          <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="0" xOffset="0" offsetType="0" placement="0" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="PreventOverlap" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-              <Option name="blendMode" value="0" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" value="" type="QString"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" value="false" type="bool"/>
-              <Option name="enabled" value="0" type="QString"/>
-              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-              <Option name="minLength" value="0" type="double"/>
-              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="minLengthUnit" value="MM" type="QString"/>
-              <Option name="offsetFromAnchor" value="0" type="double"/>
-              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-              <Option name="offsetFromLabel" value="0" type="double"/>
-              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -26507,9 +27279,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26517,12 +27289,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -26533,14 +27305,14 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label" configurationFlags="None">
+        <field configurationFlags="None" name="label">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -26549,29 +27321,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="label"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="label"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="label"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="label" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="label"/>
           <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
@@ -26608,8 +27380,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="label"/>
       </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/>
@@ -26617,7 +27389,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -26682,7 +27454,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -26707,58 +27479,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="125,139,143,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="125,139,143,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26789,36 +27561,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="125,139,143,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="89,99,102,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="125,139,143,255" k="color"/>
@@ -26833,44 +27605,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="125,139,143,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="89,99,102,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -26893,54 +27665,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
+          <rule description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="label" fontWeight="75" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Bold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="31,120,180,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="75" fieldName="label" textOpacity="0.90000000000000002" isExpression="0" namedStyle="Bold" fontSize="8" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="31,120,180,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.40000000000000002" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="0.75" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="-0.14999999999999999" shapeSizeY="0.29999999999999999" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeRotation="0" shapeBorderColor="31,120,206,255" shapeBorderWidthUnit="MM" shapeRadiiX="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.75" shapeType="0" shapeFillColor="255,255,255,204" shapeJoinStyle="64" shapeOpacity="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferSize="0.75" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="128"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeOffsetY="-0.14999999999999999" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.75" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,204" shapeRadiiY="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.59999999999999998" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0.75" shapeRotationType="0" shapeSizeY="0.29999999999999999">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="196,60,57,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="196,60,57,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -26963,34 +27735,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,204" type="QString"/>
-                        <Option name="joinstyle" value="round" 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="31,120,206,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.75" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,204" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="31,120,206,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.75" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,204" k="color"/>
@@ -27005,56 +27777,56 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
-              <placement priority="5" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="1" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="1" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PolygonGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="1" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="6" unplacedVisibility="0" obstacleFactor="0.76000000000000001" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="5" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="1"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="0" xOffset="1" offsetType="0" placement="0" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="1" offsetUnits="MapUnit" placementFlags="10" layerType="PolygonGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="PreventOverlap" centroidWhole="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="6" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="0.76000000000000001" minFeatureSize="0" upsidedownLabels="0" zIndex="5" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -27063,66 +27835,66 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -27153,9 +27925,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27163,66 +27935,66 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" value="0" type="double"/>
-            <Option name="allowedGapsEnabled" value="false" type="bool"/>
-            <Option name="allowedGapsLayer" value="" type="QString"/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option value="0" type="double" name="allowedGapsBuffer"/>
+            <Option value="false" type="bool" name="allowedGapsEnabled"/>
+            <Option value="" type="QString" name="allowedGapsLayer"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_set" configurationFlags="None">
+        <field configurationFlags="None" name="table_set">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label" configurationFlags="None">
+        <field configurationFlags="None" name="label">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="races" configurationFlags="None">
+        <field configurationFlags="None" name="races">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -27231,45 +28003,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="table_set"/>
+        <alias index="2" name="" field="label"/>
+        <alias index="3" name="" field="races"/>
+        <alias index="4" name="" field="day"/>
       </aliases>
       <defaults>
-        <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=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="table_set"/>
+        <default expression="" applyOnUpdate="0" field="label"/>
+        <default expression="" applyOnUpdate="0" field="races"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="table_set" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="races" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="table_set"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="races"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="table_set" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="races" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="table_set"/>
+        <constraint desc="" exp="" field="label"/>
+        <constraint desc="" exp="" field="races"/>
+        <constraint desc="" exp="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="table_set" type="field"/>
-          <column width="-1" hidden="0" name="label" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="130" hidden="0" name="races" type="field"/>
+          <column width="-1" hidden="0" type="field" name="table_set"/>
+          <column width="-1" hidden="0" type="field" name="label"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="130" hidden="0" type="field" name="races"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27308,18 +28080,18 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="table_set"/>
       </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/>
@@ -27353,6 +28125,7 @@ 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="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+    <layer id="cone_only_groups_5655c566_c302_4743_a580_b3593f83c018"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -27521,7 +28294,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal plan</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Fencing/Gun Run 2022 - Fencing rev 2.1 - Fences and Cones.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -27683,302 +28456,302 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option name="name" value="" type="QString"/>
+      <Option value="" type="QString" name="name"/>
       <Option name="properties"/>
-      <Option name="type" value="collection" type="QString"/>
+      <Option value="collection" type="QString" name="type"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1" style="default"/>
+      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Ask Me"/>
+        <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="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Fencing">
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1" style="Fencing"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" visible="1" 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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="water_tables20170921142016467" expanded="1" visible="0" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" visible="1" 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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" 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 id="water_tables20170921142016467" visible="0" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal map - inset">
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" 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 id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" visible="1" 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 id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1" style="default"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" visible="0" 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 id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="water_tables20170921142016467" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" visible="0" 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 id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Feeding Stations"/>
         <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="Routes"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal map - main">
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" 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 id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" visible="1" 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 id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" visible="1" 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 id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes/Markers"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes/Markers"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal plan">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" 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 id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="water_tables20170921142016467" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" visible="0" 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 id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <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="Routes"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal plan">
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" visible="1" 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 id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" visible="1" 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 id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="water_tables20170921142016467" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" visible="0" 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 id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
         <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="Routes"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Routes">
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" visible="1" 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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="water_tables20170921142016467" expanded="1" visible="0" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" visible="0" 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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" 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 id="water_tables20170921142016467" visible="0" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <checked-group-nodes>
+        <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="Routes"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1" style="Fencing"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1" style="default"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="water_tables20170921142016467" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" visible="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-group-nodes>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -28005,31 +28778,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" printResolution="120" name="Marshals" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="120" units="mm" name="Marshals" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -28044,49 +28817,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" referencePoint="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -28101,9 +28874,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28111,15 +28884,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="128.508,3.98741,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frame="true" equalColumnWidth="1" itemRotation="0" zValue="5" background="true" symbolWidth="7" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" blendMode="0" opacity="1" position="128.508,3.98741,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.1,mm" size="19.9422,32,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="bevel" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
-        <FrameColor green="128" blue="128" alpha="255" red="128"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem wrapChar="" columnSpace="2" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="128.508,3.98741,mm" columnCount="1" opacity="1" frameJoinStyle="bevel" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" type="65642" outlineWidthM="0.1,mm" zValue="5" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="19.9422,32,mm" boxSpace="2" symbolWidth="7" minSymbolSize="0" position="128.508,3.98741,mm" frame="true" symbolHeight="4" title="" referencePoint="0" positionLock="true" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="1" lineSpacing="1" resizeToContents="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" itemRotation="0" rasterBorder="1">
+        <FrameColor red="128" green="128" blue="128" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28127,37 +28900,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" bold="0" underline="0" style="Regular" italic="0" strikethrough="0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="1" indent="0" name="subgroup" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="1" name="subgroup">
+            <styleFont description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" name="symbol" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginTop="2" name="symbol">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
-                  <Option name="showFeatureCount" value="0" type="int"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option value="0" type="int" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28165,62 +28938,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem id="Inset map" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" referencePoint="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" position="98.7828,149.027,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="56.5192,54.5647,mm" mapFlags="0" positionLock="true" positionOnPage="98.7828,149.027,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal map - inset" outlineWidthM="0.2,mm" frame="true" itemRotation="0" zValue="4" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="4" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Inset map" frameJoinStyle="miter" isTemporal="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" followPresetName="Marshal map - inset" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.2,mm" size="56.5192,54.5647,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="98.7828,149.027,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="98.7828,149.027,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41788569471234993" xmax="18.42218047871277165" ymax="-33.94188878914365404" ymin="-33.94603505205213878"/>
+        <Extent ymin="-33.94603505205213878" ymax="-33.94188878914365404" xmax="18.42218047871277165" xmin="18.41788569471234993"/>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -28251,44 +29024,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -28311,40 +29084,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -28359,29 +29132,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28389,28 +29162,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" show="1" inverted="0" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" centered="1">
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <ComposerMapOverview blendMode="0" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" name="Overview 1" inverted="0">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="0,65,170,127" 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="35,35,35,102" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,65,170,127" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,102" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,65,170,127" k="color"/>
@@ -28425,9 +29198,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28435,9 +29208,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28445,69 +29218,69 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Main map" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" referencePoint="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3.53,6.0007,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="142,187.018,mm" mapFlags="0" positionLock="true" positionOnPage="3.53,6.0007,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="false" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal map - main" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="3" mapFlags="0" frame="false" positionLock="true" mapRotation="0" id="Main map" frameJoinStyle="miter" isTemporal="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" followPresetName="Marshal map - main" background="false" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="142,187.018,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="3.53,6.0007,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="3.53,6.0007,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41951926258746752" xmax="18.42054691083765405" ymax="-33.94328520011277561" ymin="-33.94463864108302431"/>
+        <Extent ymin="-33.94463864108302431" ymax="-33.94328520011277561" xmax="18.42054691083765405" xmin="18.41951926258746752"/>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -28538,44 +29311,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -28598,40 +29371,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -28646,29 +29419,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28676,22 +29449,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" referencePoint="2" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" position="290.617,6.0007,mm" sectionWidth="142.117" blendMode="0" opacity="1" hidePageIfEmpty="0" size="142.117,187.018,mm" positionLock="true" positionOnPage="290.617,6.0007,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionHeight="187.018" groupUuid="" hideBackgroundIfEmpty="0" excludeFromExports="0" background="false" frameJoinStyle="round" visibility="1" sectionX="0" outlineWidthM="0.3,mm" frame="false" itemRotation="0" sectionY="0" zValue="2" type="65647">
-        <FrameColor green="119" blue="119" alpha="255" red="119"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="2" frame="false" positionLock="true" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" id="" sectionHeight="187.018" frameJoinStyle="round" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" sectionX="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" background="false" sectionWidth="142.117" referencePoint="2" itemRotation="0" outlineWidthM="0.3,mm" size="142.117,187.018,mm" excludeFromExports="0" hideBackgroundIfEmpty="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="290.617,6.0007,mm" type="65647" positionOnPage="290.617,6.0007,mm" sectionY="0" hidePageIfEmpty="0">
+        <FrameColor red="119" green="119" blue="119" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28699,21 +29472,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" referencePoint="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" position="246.665,178.41,mm" anchorPoint="0" blendMode="0" opacity="1" pictureHeight="25.2491" size="47.1065,27.6,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="246.665,178.41,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_500.png" pictureWidth="47.1065" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../GunRun2022_500.png" zValue="1" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="47.1065" id="" pictureHeight="25.2491" frameJoinStyle="miter" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgFillColor="255,255,255,255" mapUuid="" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="47.1065,27.6,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="246.665,178.41,mm" type="65640" anchorPoint="0" positionOnPage="246.665,178.41,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28721,14 +29494,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame contentMode="1" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" resizeMode="0" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" evaluateExpressions="true" maxBreakDistance="12" useSmartBreaks="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" type="65648" 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>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;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_phone&quot;%]&lt;/td>&lt;tr>&#xa;&#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 return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" url="">
+      <LayoutMultiFrame templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&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;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_phone&quot;%]&lt;/td>&lt;tr>&#xa;&#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 return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" useSmartBreaks="true" stylesheetEnabled="true" url="" evaluateExpressions="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" contentMode="1" resizeMode="0" type="65648" maxBreakDistance="12" 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="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28738,53 +29511,53 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="jpg" type="QString"/>
-          <Option name="forceVector" value="0" type="QString"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropMarginUnit" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
-          <Option name="pdfTextFormat" value="0" type="QString"/>
-          <Option name="rasterize" value="false" type="QString"/>
-          <Option name="resizeToContentsBottomMargin" value="3.53" type="QString"/>
-          <Option name="resizeToContentsLeftMargin" value="3.53" type="QString"/>
-          <Option name="resizeToContentsRightMargin" value="3.53" type="QString"/>
-          <Option name="resizeToContentsTopMargin" value="3.53" type="QString"/>
-          <Option name="singleFile" value="false" type="QString"/>
+          <Option value="jpg" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="0" type="QString" name="imageCropMarginUnit"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="false" type="QString" name="rasterize"/>
+          <Option value="3.53" type="QString" name="resizeToContentsBottomMargin"/>
+          <Option value="3.53" type="QString" name="resizeToContentsLeftMargin"/>
+          <Option value="3.53" type="QString" name="resizeToContentsRightMargin"/>
+          <Option value="3.53" type="QString" name="resizeToContentsTopMargin"/>
+          <Option value="false" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1" pageNameExpression="&quot;position&quot;" sortKey="&quot;id&quot;" enabled="1" hideCoverage="0" coverageLayerName="marshal_positions"/>
+      <Atlas sortFeatures="1" sortKey="&quot;id&quot;" filterFeatures="0" coverageLayerName="marshal_positions" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayerProvider="ogr" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortAscending="1" enabled="1" hideCoverage="0" pageNameExpression="&quot;position&quot;"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="300" name="Start &amp; Finish Backgrounds" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="300" units="mm" name="Start &amp; Finish Backgrounds" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -28799,49 +29572,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" referencePoint="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -28856,9 +29629,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28866,21 +29639,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem id="" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" referencePoint="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" position="286.027,2,mm" anchorPoint="0" blendMode="0" opacity="1" pictureHeight="7.97477" size="9.45865,11,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="286.027,2,mm" svgBorderColor="0,0,0,255" northMode="0" file="arrows/NorthArrow_11.svg" pictureWidth="6.31767" groupUuid="" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="330" visibility="1" mode="0" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="arrows/NorthArrow_11.svg" zValue="4" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="6.31767" id="" pictureHeight="7.97477" frameJoinStyle="miter" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderWidth="0.2" pictureRotation="330" mode="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgFillColor="255,255,255,255" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="9.45865,11,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="286.027,2,mm" type="65640" anchorPoint="0" positionOnPage="286.027,2,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28888,47 +29661,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" halign="1" referencePoint="0" labelText="[%upper( &quot;area&quot; )%]" marginX="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" position="285.027,205.886,mm" blendMode="0" opacity="1" size="142.543,10.3185,mm" positionLock="true" positionOnPage="285.027,205.886,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="270" valign="64" zValue="3" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="3" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" labelText="[%upper( &quot;area&quot; )%]" halign="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="270" outlineWidthM="0.3,mm" size="142.543,10.3185,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="285.027,205.886,mm" type="65641" positionOnPage="285.027,205.886,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -28943,65 +29716,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" lineJoinStyle="miter" style="Single Box" outlineWidth="0.3" segmentMillimeters="26.3519" alignment="0" referencePoint="0" positionOnPage="7,189.669,mm" type="65646" labelHorizontalPlacement="0" minBarWidth="50" subdivisionsHeight="1.5" visibility="1" unitType="meters" boxContentSpace="1" labelBarSpace="3" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frame="false" itemRotation="0" segmentSizeMode="1" zValue="2" labelVerticalPlacement="0" background="false" lineCapStyle="square" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" blendMode="0" opacity="1" position="7,189.669,mm" positionLock="true" numMapUnitsPerScaleBarUnit="1" numSegmentsLeft="2" numSubdivisions="1" maxBarWidth="150" outlineWidthM="0.3,mm" numSegments="4" unitLabel="m" size="145.54,16.2165,mm" groupUuid="" excludeFromExports="0" frameJoinStyle="miter" id="" height="3" numUnitsPerSegment="100">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem numSubdivisions="1" groupUuid="" background="false" outlineWidth="0.3" lineJoinStyle="miter" positionOnPage="7,189.669,mm" unitType="meters" labelHorizontalPlacement="0" unitLabel="m" opacity="1" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" blendMode="0" alignment="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" minBarWidth="50" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" type="65646" labelBarSpace="3" lineCapStyle="square" outlineWidthM="0.3,mm" zValue="2" excludeFromExports="0" id="" numSegmentsLeft="2" size="145.54,16.2165,mm" position="7,189.669,mm" labelVerticalPlacement="0" frame="false" numUnitsPerSegment="100" referencePoint="0" positionLock="true" height="3" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" numSegments="4" visibility="1" segmentMillimeters="26.3519" style="Single Box" subdivisionsHeight="1.5" itemRotation="0" maxBarWidth="150" segmentSizeMode="1" boxContentSpace="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29016,75 +29789,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" blue="0" alpha="255" red="0"/>
+        <strokeColor red="0" green="0" blue="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" value="" type="QChar"/>
-            <Option name="decimals" value="6" type="int"/>
-            <Option name="rounding_type" value="0" type="int"/>
-            <Option name="show_plus" value="false" type="bool"/>
-            <Option name="show_thousand_separator" value="true" type="bool"/>
-            <Option name="show_trailing_zeros" value="false" type="bool"/>
-            <Option name="thousand_separator" value="" type="QChar"/>
+            <Option value="" type="QChar" name="decimal_separator"/>
+            <Option value="6" type="int" name="decimals"/>
+            <Option value="0" type="int" name="rounding_type"/>
+            <Option value="false" type="bool" name="show_plus"/>
+            <Option value="true" type="bool" name="show_thousand_separator"/>
+            <Option value="false" type="bool" name="show_trailing_zeros"/>
+            <Option value="" type="QChar" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor green="0" blue="0" alpha="255" red="0"/>
-        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
+        <fillColor red="0" green="0" blue="0" alpha="255"/>
+        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="miter" type="QString"/>
-                <Option name="line_color" value="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.3" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.3" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29115,52 +29888,52 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="miter" type="QString"/>
-                <Option name="line_color" value="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.3" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.3" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29191,52 +29964,52 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="miter" type="QString"/>
-                <Option name="line_color" value="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.3" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.3" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29267,36 +30040,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="0,0,0,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -29311,36 +30084,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -29355,87 +30128,87 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem id="" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" referencePoint="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" position="7,5.5,mm" mapRotation="330" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="278.027,180.318,mm" mapFlags="0" positionLock="true" positionOnPage="7,5.5,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="false" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Start/Finish" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="false" positionLock="true" mapRotation="330" id="" frameJoinStyle="miter" isTemporal="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" followPresetName="Start/Finish" background="false" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="278.027,180.318,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="7,5.5,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="7,5.5,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="rotation" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="rotation" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="id" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="id" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="angle" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedRotation">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="angle" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40843143571575169" xmax="18.41790915398017958" ymax="-33.89880140828828559" ymin="-33.90494830469008747"/>
+        <Extent ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmax="18.41790915398017958" xmin="18.40843143571575169"/>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="4" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="3" offsetY="0" topAnnotationDisplay="3" gridFrameStyle="0" gridFrameMargin="0" unit="1" intervalY="5" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="5" gridStyle="0" blendMode="0" bottomAnnotationDisplay="3" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="3" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="1" gridFrameMargin="0" annotationFormat="4" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="3" annotationExpression="" intervalY="5" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="5" bottomAnnotationDisplay="3" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="195,195,195,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="195,195,195,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -29466,44 +30239,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -29526,9 +30299,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -29545,32 +30318,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -29585,29 +30358,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29615,65 +30388,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.05"/>
+        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="QString"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
-          <Option name="pdfTextFormat" value="0" type="QString"/>
-          <Option name="singleFile" value="true" type="QString"/>
-          <Option name="svgCropMarginBottom" value="0" type="QString"/>
-          <Option name="svgCropMarginLeft" value="0" type="QString"/>
-          <Option name="svgCropMarginRight" value="0" type="QString"/>
-          <Option name="svgCropMarginTop" value="0" type="QString"/>
-          <Option name="svgCropToContents" value="true" type="QString"/>
-          <Option name="svgDisableRasterTiles" value="0" type="QString"/>
-          <Option name="svgGroupLayers" value="false" type="QString"/>
-          <Option name="svgIncludeMetadata" value="1" type="QString"/>
-          <Option name="svgTextFormat" value="0" type="QString"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
+          <Option value="0" type="QString" name="svgCropMarginBottom"/>
+          <Option value="0" type="QString" name="svgCropMarginLeft"/>
+          <Option value="0" type="QString" name="svgCropMarginRight"/>
+          <Option value="0" type="QString" name="svgCropMarginTop"/>
+          <Option value="true" type="QString" name="svgCropToContents"/>
+          <Option value="0" type="QString" name="svgDisableRasterTiles"/>
+          <Option value="false" type="QString" name="svgGroupLayers"/>
+          <Option value="1" type="QString" name="svgIncludeMetadata"/>
+          <Option value="0" type="QString" name="svgTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;area&quot;" sortKey="area" enabled="1" hideCoverage="1" coverageLayerName="start_finish_area"/>
+      <Atlas sortFeatures="1" sortKey="area" filterFeatures="0" coverageLayerName="start_finish_area" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="ogr" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortAscending="1" enabled="1" hideCoverage="1" pageNameExpression="&quot;area&quot;"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="300" name="Fencing" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="300" units="mm" name="Fencing" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -29688,49 +30461,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" referencePoint="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -29745,9 +30518,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29755,15 +30528,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="256.808,5.21277,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="true" equalColumnWidth="1" itemRotation="0" zValue="11" background="true" symbolWidth="7" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" blendMode="0" opacity="1" position="256.808,5.21277,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="38.1563,67.2879,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem wrapChar="" columnSpace="2" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="256.808,5.21277,mm" columnCount="1" opacity="1" frameJoinStyle="miter" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" type="65642" outlineWidthM="0.3,mm" zValue="11" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="38.1563,67.2879,mm" boxSpace="2" symbolWidth="7" minSymbolSize="0" position="256.808,5.21277,mm" frame="true" symbolHeight="4" title="" referencePoint="0" positionLock="true" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="1" lineSpacing="1" resizeToContents="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" itemRotation="0" rasterBorder="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29771,53 +30544,53 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" bold="1" underline="0" style="Bold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="3" indent="0" name="group" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="3" name="group">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="3" indent="0" name="subgroup" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="3" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" underline="0" style="Regular" italic="0" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Fencing and Cones" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" expanded="1" providerKey="ogr" name="fencing" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="fencing" source="./fencing.shp|layername=fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
-                  <Option name="legend/expressionFilter" value="" type="QString"/>
-                  <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
-                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
+                  <Option value="" type="QString" name="legend/expressionFilter"/>
+                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
-                  <Option name="showFeatureCount" value="0" type="int"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option value="0" type="int" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29825,47 +30598,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem id="" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" halign="1" referencePoint="0" labelText="FENCING: [% &quot;name&quot; %]" marginX="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" position="6.76779,191.188,mm" blendMode="0" opacity="1" size="148.46,6.45211,mm" positionLock="true" positionOnPage="6.76779,191.188,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="10" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="10" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" labelText="FENCING: [% &quot;name&quot; %]" halign="1" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="148.46,6.45211,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="6.76779,191.188,mm" type="65641" positionOnPage="6.76779,191.188,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="63" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29880,65 +30653,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" halign="2" referencePoint="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" marginX="0" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" position="182.723,191.188,mm" blendMode="0" opacity="1" size="56.3557,6.45237,mm" positionLock="true" positionOnPage="182.723,191.188,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="9" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="9" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" halign="2" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginY="0" htmlState="1" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="56.3557,6.45237,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="182.723,191.188,mm" type="65641" positionOnPage="182.723,191.188,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29953,65 +30726,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" halign="2" referencePoint="0" labelText="REVISION 2.0" marginX="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" position="209.146,198.083,mm" blendMode="0" opacity="1" size="26.8205,6.82826,mm" positionLock="true" positionOnPage="209.146,198.083,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="8" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="8" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" labelText="REVISION 2.1" halign="2" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="26.8205,6.82826,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="209.146,198.083,mm" type="65641" positionOnPage="209.146,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30026,65 +30799,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" halign="1" referencePoint="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" marginX="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" position="62.6706,198.083,mm" blendMode="0" opacity="1" size="51.1638,7.07327,mm" positionLock="true" positionOnPage="62.6706,198.083,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="7" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="7" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" halign="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="51.1638,7.07327,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="62.6706,198.083,mm" type="65641" positionOnPage="62.6706,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30099,65 +30872,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" halign="1" referencePoint="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" marginX="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" position="116.805,198.083,mm" blendMode="0" opacity="1" size="64.7594,7.10512,mm" positionLock="true" positionOnPage="116.805,198.083,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="6" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="6" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" halign="1" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="64.7594,7.10512,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="116.805,198.083,mm" type="65641" positionOnPage="116.805,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30172,65 +30945,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" halign="1" referencePoint="0" labelText="Page [% @atlas_featurenumber %]" marginX="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" position="6.76779,198.083,mm" blendMode="0" opacity="1" size="52.7903,7.07327,mm" positionLock="true" positionOnPage="6.76779,198.083,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="5" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" labelText="Page [% @atlas_featurenumber %]" halign="1" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="52.7903,7.07327,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="6.76779,198.083,mm" type="65641" positionOnPage="6.76779,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30245,39 +31018,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" referencePoint="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" position="243.098,175.353,mm" anchorPoint="8" blendMode="0" opacity="1" pictureHeight="26.4325" size="49.3143,29.8354,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="243.098,175.353,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_250.png" pictureWidth="49.3143" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../GunRun2022_250.png" zValue="4" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="49.3143" id="" pictureHeight="26.4325" frameJoinStyle="miter" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgFillColor="255,255,255,255" mapUuid="" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="49.3143,29.8354,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="243.098,175.353,mm" type="65640" anchorPoint="8" positionOnPage="243.098,175.353,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30285,42 +31058,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" referencePoint="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" position="6.91779,197.79,mm" blendMode="0" opacity="1" size="232.01,0.14328,mm" positionLock="true" positionOnPage="6.91779,197.79,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="3" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" cornerRadiusMeasure="0,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="232.01,0.14328,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="6.91779,197.79,mm" type="65643" positionOnPage="6.91779,197.79,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -30335,55 +31108,55 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" lineJoinStyle="round" style="Double Box" outlineWidth="0.2" segmentMillimeters="32.0947" alignment="0" referencePoint="0" positionOnPage="6.76779,2.8482,mm" type="65646" labelHorizontalPlacement="0" minBarWidth="25" subdivisionsHeight="1.5" visibility="1" unitType="meters" boxContentSpace="0.2" labelBarSpace="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="false" itemRotation="0" segmentSizeMode="1" zValue="2" labelVerticalPlacement="0" background="false" lineCapStyle="square" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" blendMode="0" opacity="1" position="6.76779,2.8482,mm" positionLock="true" numMapUnitsPerScaleBarUnit="1" numSegmentsLeft="2" numSubdivisions="1" maxBarWidth="100" outlineWidthM="0.3,mm" numSegments="2" unitLabel="m" size="106.045,15.8378,mm" groupUuid="" excludeFromExports="0" frameJoinStyle="miter" id="" height="2" numUnitsPerSegment="20">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem numSubdivisions="1" groupUuid="" background="false" outlineWidth="0.2" lineJoinStyle="round" positionOnPage="6.76779,2.8482,mm" unitType="meters" labelHorizontalPlacement="0" unitLabel="m" opacity="1" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" blendMode="0" alignment="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" minBarWidth="25" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" type="65646" labelBarSpace="1" lineCapStyle="square" outlineWidthM="0.3,mm" zValue="2" excludeFromExports="0" id="" numSegmentsLeft="2" size="106.045,15.8378,mm" position="6.76779,2.8482,mm" labelVerticalPlacement="0" frame="false" numUnitsPerSegment="20" referencePoint="0" positionLock="true" height="2" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" numSegments="2" visibility="1" segmentMillimeters="32.0947" style="Double Box" subdivisionsHeight="1.5" itemRotation="0" maxBarWidth="100" segmentSizeMode="1" boxContentSpace="0.2">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30398,75 +31171,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" blue="0" alpha="255" red="0"/>
+        <strokeColor red="0" green="0" blue="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" value="" type="QChar"/>
-            <Option name="decimals" value="6" type="int"/>
-            <Option name="rounding_type" value="0" type="int"/>
-            <Option name="show_plus" value="false" type="bool"/>
-            <Option name="show_thousand_separator" value="true" type="bool"/>
-            <Option name="show_trailing_zeros" value="false" type="bool"/>
-            <Option name="thousand_separator" value="" type="QChar"/>
+            <Option value="" type="QChar" name="decimal_separator"/>
+            <Option value="6" type="int" name="decimals"/>
+            <Option value="0" type="int" name="rounding_type"/>
+            <Option value="false" type="bool" name="show_plus"/>
+            <Option value="true" type="bool" name="show_thousand_separator"/>
+            <Option value="false" type="bool" name="show_trailing_zeros"/>
+            <Option value="" type="QChar" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor green="0" blue="0" alpha="255" red="0"/>
-        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
+        <fillColor red="0" green="0" blue="0" alpha="255"/>
+        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="round" type="QString"/>
-                <Option name="line_color" value="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.2" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30497,52 +31270,52 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="round" type="QString"/>
-                <Option name="line_color" value="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.2" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30573,52 +31346,52 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="round" type="QString"/>
-                <Option name="line_color" value="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.2" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30649,36 +31422,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="0,0,0,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -30693,36 +31466,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -30737,53 +31510,53 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem id="" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" referencePoint="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" position="6.76779,9.35102,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="0.9" size="283.418,180.92,mm" mapFlags="0" positionLock="true" positionOnPage="6.76779,9.35102,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="false" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Fencing" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="false" positionLock="true" mapRotation="0" id="" frameJoinStyle="miter" isTemporal="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" followPresetName="Fencing" background="false" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="283.418,180.92,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="0.9" groupUuid="" position="6.76779,9.35102,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="transformer" type="Map">
-                    <Option name="d" type="Map">
-                      <Option name="exponent" value="1" type="double"/>
-                      <Option name="maxOutput" value="360" type="double"/>
-                      <Option name="maxValue" value="0" type="double"/>
-                      <Option name="minOutput" value="0" type="double"/>
-                      <Option name="minValue" value="0" type="double"/>
-                      <Option name="nullOutput" value="0" type="double"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option type="Map" name="transformer">
+                    <Option type="Map" name="d">
+                      <Option value="1" type="double" name="exponent"/>
+                      <Option value="360" type="double" name="maxOutput"/>
+                      <Option value="0" type="double" name="maxValue"/>
+                      <Option value="0" type="double" name="minOutput"/>
+                      <Option value="0" type="double" name="minValue"/>
+                      <Option value="0" type="double" name="nullOutput"/>
                     </Option>
-                    <Option name="t" value="0" type="int"/>
+                    <Option value="0" type="int" name="t"/>
                   </Option>
-                  <Option name="type" value="3" type="int"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="angle" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedRotation">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="angle" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40366172969380543" xmax="18.40524827801807461" ymax="-33.90718453497852636" ymin="-33.90819730717838354"/>
+        <Extent ymin="-33.90819730717838354" ymax="-33.90718453497852636" xmax="18.40524827801807461" xmin="18.40366172969380543"/>
         <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>
@@ -30798,45 +31571,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="4" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="3" offsetY="0" topAnnotationDisplay="3" gridFrameStyle="0" gridFrameMargin="0" unit="1" intervalY="5" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="5" gridStyle="0" blendMode="0" bottomAnnotationDisplay="3" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="3" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="1" gridFrameMargin="0" annotationFormat="4" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="3" annotationExpression="" intervalY="5" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="5" bottomAnnotationDisplay="3" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="195,195,195,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="195,195,195,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -30867,44 +31640,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -30927,9 +31700,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -30946,32 +31719,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -30986,29 +31759,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31016,65 +31789,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.40000000000000002"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="int"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfAppendGeoreference" value="1" type="int"/>
-          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
-          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
-          <Option name="pdfExportThemes" value="" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="int"/>
-          <Option 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~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString"/>
-          <Option name="pdfLosslessImages" value="0" type="int"/>
-          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
-          <Option name="pdfSimplify" value="1" type="int"/>
-          <Option name="pdfTextFormat" value="0" type="int"/>
-          <Option name="rasterize" value="true" type="QString"/>
-          <Option name="singleFile" value="true" type="bool"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="int" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="1" type="int" name="pdfAppendGeoreference"/>
+          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
+          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="int" name="pdfIncludeMetadata"/>
+          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_5655c566_c302_4743_a580_b3593f83c018" type="QString" name="pdfLayerOrder"/>
+          <Option value="0" type="int" name="pdfLosslessImages"/>
+          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="int" name="pdfSimplify"/>
+          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="rasterize"/>
+          <Option value="true" type="bool" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortFeatures="1" coverageLayerProvider="virtual" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;name&quot;" sortKey="&quot;group&quot;" enabled="1" hideCoverage="1" coverageLayerName="fence_groups"/>
+      <Atlas sortFeatures="1" sortKey="&quot;group&quot;" filterFeatures="0" coverageLayerName="fence_groups" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="virtual" 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(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" sortAscending="1" enabled="1" hideCoverage="1" pageNameExpression="&quot;name&quot;"/>
     </Layout>
-    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="144" name="Ask Me" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="9" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" units="mm" name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="9" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -31089,49 +31862,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" referencePoint="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -31146,59 +31919,59 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" units="mm" page="0" orientation="2"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem id="" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" halign="1" referencePoint="0" labelText="Directions to Start of Race" marginX="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" position="4.43449,186.634,mm" blendMode="0" opacity="1" size="83.9998,10.4638,mm" positionLock="false" positionOnPage="4.43449,186.634,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="8" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="8" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" labelText="Directions to Start of Race" halign="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="83.9998,10.4638,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="4.43449,186.634,mm" type="65641" positionOnPage="4.43449,186.634,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="14" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="14" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31213,65 +31986,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" halign="1" referencePoint="0" labelText="Gun Run" marginX="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" position="4.43449,197.498,mm" blendMode="0" opacity="1" size="48.2923,9.511,mm" positionLock="false" positionOnPage="4.43449,197.498,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="7" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="7" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" labelText="Gun Run" halign="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="48.2923,9.511,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="4.43449,197.498,mm" type="65641" positionOnPage="4.43449,197.498,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31286,33 +32059,33 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem columnSpace="0" rasterBorder="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" title="" lineSpacing="2" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="10.096,10.8563,mm" type="65642" legendFilterByAtlas="0" symbolHeight="5" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frame="true" equalColumnWidth="0" itemRotation="0" zValue="6" background="true" symbolWidth="9" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" blendMode="0" opacity="1" position="10.096,10.8563,mm" positionLock="false" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" legendFilterByMap="1" size="59.0766,76,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="round" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
-        <FrameColor green="139" blue="139" alpha="255" red="139"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem wrapChar="" columnSpace="0" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="10.096,10.8563,mm" columnCount="1" opacity="1" frameJoinStyle="round" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" type="65642" outlineWidthM="0.3,mm" zValue="6" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="59.0766,76,mm" boxSpace="2" symbolWidth="9" minSymbolSize="0" position="10.096,10.8563,mm" frame="true" symbolHeight="5" title="" referencePoint="0" positionLock="false" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="0" lineSpacing="2" resizeToContents="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" itemRotation="0" rasterBorder="1" legendFilterByMap="1">
+        <FrameColor red="139" green="139" blue="139" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31320,52 +32093,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="subgroup">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2.5" indent="0" marginLeft="3" name="symbolLabel" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginLeft="3" marginTop="2.5" name="symbolLabel">
+            <styleFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" bold="0" underline="0" style="Regular" italic="0" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Ask Me" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Ask Me">
             <customproperties>
               <Option type="Map">
-                <Option name="legend/title-style" value="hidden" type="QString"/>
+                <Option value="hidden" type="QString" name="legend/title-style"/>
               </Option>
             </customproperties>
-            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" expanded="1" providerKey="ogr" name="poi_labels" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/label-0" value="Start/Finish" type="QString"/>
-                  <Option name="legend/label-1" value="Toilets" type="QString"/>
-                  <Option name="legend/label-2" value="Tog Bag Drop-off" type="QString"/>
-                  <Option name="legend/label-3" value="Road Closed to Cars" type="QString"/>
-                  <Option name="legend/label-4" value="MyCiti Drop-off" type="QString"/>
-                  <Option name="legend/label-5" value="Parking" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option value="Start/Finish" type="QString" name="legend/label-0"/>
+                  <Option value="Toilets" type="QString" name="legend/label-1"/>
+                  <Option value="Tog Bag Drop-off" type="QString" name="legend/label-2"/>
+                  <Option value="Road Closed to Cars" type="QString" name="legend/label-3"/>
+                  <Option value="MyCiti Drop-off" type="QString" name="legend/label-4"/>
+                  <Option value="Parking" type="QString" name="legend/label-5"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" expanded="1" providerKey="ogr" name="directions_to_start" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/label-0" value="To 21KM Start (06:30)" type="QString"/>
-                  <Option name="legend/label-1" value="To 10KM Start (07:30)" type="QString"/>
-                  <Option name="legend/label-2" value="To 5KM Start (08:30)" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option value="To 21KM Start (06:30)" type="QString" name="legend/label-0"/>
+                  <Option value="To 10KM Start (07:30)" type="QString" name="legend/label-1"/>
+                  <Option value="To 5KM Start (08:30)" type="QString" name="legend/label-2"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -31373,47 +32146,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem id="" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" halign="2" referencePoint="0" labelText="REVISION 1.0" marginX="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" position="221.862,190.027,mm" blendMode="0" opacity="1" size="27.7839,6.871,mm" positionLock="false" positionOnPage="221.862,190.027,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="5" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" labelText="REVISION 1.0" halign="2" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="27.7839,6.871,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="221.862,190.027,mm" type="65641" positionOnPage="221.862,190.027,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31428,65 +32201,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" position="197.975,197.498,mm" blendMode="0" opacity="1" size="51.6706,6.60801,mm" positionLock="false" positionOnPage="197.975,197.498,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="4" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="4" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" labelText="Sunday, 20 October 2019" halign="2" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="51.6706,6.60801,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="197.975,197.498,mm" type="65641" positionOnPage="197.975,197.498,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31501,39 +32274,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" referencePoint="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" position="249.646,179.724,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="24.3824" size="42.9838,24.3824,mm" positionLock="false" svgBorderWidth="0.2" northOffset="0" positionOnPage="249.646,179.724,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="24.2337" groupUuid="" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../Gun_Run_Logo.png" zValue="3" frame="false" positionLock="false" resizeMode="0" northOffset="0" pictureWidth="24.2337" id="" pictureHeight="24.3824" frameJoinStyle="miter" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgFillColor="255,255,255,255" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="42.9838,24.3824,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="249.646,179.724,mm" type="65640" anchorPoint="4" positionOnPage="249.646,179.724,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31541,42 +32314,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" referencePoint="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" position="4.58449,197.248,mm" blendMode="0" opacity="1" size="244.912,0.1,mm" positionLock="false" positionOnPage="4.58449,197.248,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="2" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="2" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" cornerRadiusMeasure="0,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="244.912,0.1,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="4.58449,197.248,mm" type="65643" positionOnPage="4.58449,197.248,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -31591,46 +32364,46 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem id="" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" referencePoint="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" position="4.43449,6.411,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="288.007,183.616,mm" mapFlags="0" positionLock="false" positionOnPage="4.43449,6.411,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Ask Me" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="false" positionLock="false" mapRotation="0" id="" frameJoinStyle="miter" isTemporal="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" followPresetName="Ask Me" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="288.007,183.616,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="4.43449,6.411,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="4.43449,6.411,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39762336729721071" xmax="18.41789384089274151" ymax="-33.8970204297764468" ymin="-33.90994364588821952"/>
+        <Extent ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmax="18.41789384089274151" xmin="18.39762336729721071"/>
         <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>
@@ -31645,45 +32418,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -31714,44 +32487,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -31774,40 +32547,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -31822,29 +32595,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31852,56 +32625,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="QString"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
-          <Option name="pdfTextFormat" value="0" type="QString"/>
-          <Option name="singleFile" value="true" type="QString"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="" sortFeatures="0" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" enabled="0" hideCoverage="0"/>
+      <Atlas sortFeatures="0" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" enabled="0" hideCoverage="0" pageNameExpression=""/>
     </Layout>
-    <Layout worldFileMap="" printResolution="144" name="Routes" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" units="mm" name="Routes" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -31916,49 +32689,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" referencePoint="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -31973,59 +32746,59 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" units="mm" page="0" orientation="2"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem id="" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" halign="2" referencePoint="0" labelText="REVISION 3.2" marginX="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" position="200.171,199.082,mm" blendMode="0" opacity="1" size="61.5373,6.8714,mm" positionLock="true" positionOnPage="200.171,199.082,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="13" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="13" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" labelText="REVISION 3.2" halign="2" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="61.5373,6.8714,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="200.171,199.082,mm" type="65641" positionOnPage="200.171,199.082,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32040,65 +32813,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" halign="1" referencePoint="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" marginX="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" position="9.7863,192.073,mm" blendMode="0" opacity="1" size="61.5373,6.60801,mm" positionLock="true" positionOnPage="9.7863,192.073,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="12" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="12" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" labelText="Gun Run 2022: [%&quot;Source&quot;%]" halign="1" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="61.5373,6.60801,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="9.7863,192.073,mm" type="65641" positionOnPage="9.7863,192.073,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32113,65 +32886,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" halign="1" referencePoint="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" marginX="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" position="9.7863,199.082,mm" blendMode="0" opacity="1" size="61.5373,6.60801,mm" positionLock="true" positionOnPage="9.7863,199.082,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="11" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="11" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" halign="1" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="61.5373,6.60801,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="9.7863,199.082,mm" type="65641" positionOnPage="9.7863,199.082,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32186,39 +32959,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" referencePoint="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" position="262.196,188.218,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="15.9472" size="29.7523,17.4718,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="262.196,188.218,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_250.png" pictureWidth="29.7523" groupUuid="" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="10" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../GunRun2022_250.png" zValue="10" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="29.7523" id="" pictureHeight="15.9472" frameJoinStyle="miter" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgFillColor="255,255,255,255" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="29.7523,17.4718,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="262.196,188.218,mm" type="65640" anchorPoint="4" positionOnPage="262.196,188.218,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32226,42 +32999,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" referencePoint="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" position="9.57644,198.832,mm" blendMode="0" opacity="1" size="251.982,0.1,mm" positionLock="true" positionOnPage="9.57644,198.832,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="9" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="9" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" cornerRadiusMeasure="0,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="251.982,0.1,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="9.57644,198.832,mm" type="65643" positionOnPage="9.57644,198.832,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -32276,321 +33049,321 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem id="Trail Finish" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" referencePoint="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" position="9.57644,5.42566,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="107.861,186.385,mm" mapFlags="0" positionLock="true" positionOnPage="9.57644,5.42566,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="8" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="8" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Trail Finish" frameJoinStyle="miter" isTemporal="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.3,mm" size="107.861,186.385,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="9.57644,5.42566,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="9.57644,5.42566,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39314911415855391" xmax="18.41187375074135701" ymax="-33.90007566747966905" ymin="-33.93243205975926458"/>
+        <Extent ymin="-33.93243205975926458" ymax="-33.90007566747966905" xmax="18.41187375074135701" xmin="18.39314911415855391"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Trail Start" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" referencePoint="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" position="112.643,4.09761,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="179.156,189.279,mm" mapFlags="0" positionLock="true" positionOnPage="112.643,4.09761,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="7" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="7" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Trail Start" frameJoinStyle="miter" isTemporal="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.3,mm" size="179.156,189.279,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="112.643,4.09761,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="112.643,4.09761,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3924263991010406" xmax="18.42354248737832023" ymax="-33.92484901666441743" ymin="-33.95772328900195447"/>
+        <Extent ymin="-33.95772328900195447" ymax="-33.92484901666441743" xmax="18.42354248737832023" xmin="18.3924263991010406"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Left inset 21KM" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" referencePoint="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" position="5.86559,4.09761,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="67.7828,166.874,mm" mapFlags="0" positionLock="true" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="6" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="6" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Left inset 21KM" frameJoinStyle="miter" isTemporal="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="67.7828,166.874,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="5.86559,4.09761,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMax">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMax">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37399999999999878" xmax="18.38626092146919788" ymax="-33.91681492292400435" ymin="-33.94700000000000273"/>
+        <Extent ymin="-33.94700000000000273" ymax="-33.91681492292400435" xmax="18.38626092146919788" xmin="18.37399999999999878"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Bottom inset 21KM" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" referencePoint="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="133.191,119.125,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="113.3,76.1023,mm" mapFlags="0" positionLock="true" positionOnPage="133.191,119.125,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="5" type="65639">
-        <FrameColor green="34" blue="144" alpha="255" red="103"/>
-        <BackgroundColor green="175" blue="215" alpha="255" red="200"/>
+      <LayoutItem zValue="5" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Bottom inset 21KM" frameJoinStyle="miter" isTemporal="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.3,mm" size="113.3,76.1023,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="133.191,119.125,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="133.191,119.125,mm" keepLayerSet="false">
+        <FrameColor red="103" green="34" blue="144" alpha="255"/>
+        <BackgroundColor red="200" green="175" blue="215" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41509620662891678" xmax="18.42329132157224336" ymax="-33.91132718340826813" ymin="-33.9168317482614512"/>
+        <Extent ymin="-33.9168317482614512" ymax="-33.91132718340826813" xmax="18.42329132157224336" xmin="18.41509620662891678"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="End inset Trail" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" referencePoint="0" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" position="19.6693,7.89412,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="68.3676,117.12,mm" mapFlags="0" positionLock="true" positionOnPage="19.6693,7.89412,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="4" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="4" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="End inset Trail" frameJoinStyle="miter" isTemporal="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.3,mm" size="68.3676,117.12,mm" excludeFromExports="0" visibility="0" blendMode="0" opacity="1" groupUuid="" position="19.6693,7.89412,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="19.6693,7.89412,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.4044900556177744" xmax="18.41240136424316276" ymax="-33.90099106513847005" ymin="-33.91454383501641701"/>
+        <Extent ymin="-33.91454383501641701" ymax="-33.90099106513847005" xmax="18.41240136424316276" xmin="18.4044900556177744"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Start inset Trail" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" referencePoint="0" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" position="170.062,49.6297,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="63.655,88.3012,mm" mapFlags="0" positionLock="true" positionOnPage="170.062,49.6297,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="3" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="3" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Start inset Trail" frameJoinStyle="miter" isTemporal="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.3,mm" size="63.655,88.3012,mm" excludeFromExports="0" visibility="0" blendMode="0" opacity="1" groupUuid="" position="170.062,49.6297,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="170.062,49.6297,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41445559427620893" xmax="18.4185691326545431" ymax="-33.94253141264477591" ymin="-33.94823764719958348"/>
+        <Extent ymin="-33.94823764719958348" ymax="-33.94253141264477591" xmax="18.4185691326545431" xmin="18.41445559427620893"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Contour inset Trail" uuid="{917a530c-14f4-4ed8-b109-961939435221}" referencePoint="0" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" position="200.321,125.314,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="75.8756,69.7635,mm" mapFlags="0" positionLock="true" positionOnPage="200.321,125.314,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="2" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="2" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Contour inset Trail" frameJoinStyle="miter" isTemporal="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.3,mm" size="75.8756,69.7635,mm" excludeFromExports="0" visibility="0" blendMode="0" opacity="1" groupUuid="" position="200.321,125.314,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="200.321,125.314,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41234259163472942" xmax="18.42332635419156972" ymax="-33.94692690566557047" ymin="-33.95702588572736147"/>
+        <Extent ymin="-33.95702588572736147" ymax="-33.94692690566557047" xmax="18.42332635419156972" xmin="18.41234259163472942"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Main Map" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" referencePoint="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" position="9.50144,5.50066,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="282.372,186.105,mm" mapFlags="0" positionLock="false" positionOnPage="9.50144,5.50066,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="round" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.15,mm" frame="true" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="true" positionLock="false" mapRotation="0" id="Main Map" frameJoinStyle="round" isTemporal="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.15,mm" size="282.372,186.105,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="9.50144,5.50066,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="9.50144,5.50066,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36400000000000077" xmax="18.45389078049076304" ymax="-33.89975491900725046" ymin="-33.95900000000000318"/>
+        <Extent ymin="-33.95900000000000318" ymax="-33.89975491900725046" xmax="18.45389078049076304" xmin="18.36400000000000077"/>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -32621,44 +33394,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -32681,40 +33454,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -32729,29 +33502,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32759,34 +33532,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" show="1" inverted="0" name="Overview 1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" centered="0">
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <ComposerMapOverview blendMode="0" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="3" centered="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" name="Overview 1" inverted="0">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
-                <Option name="properties" type="Map">
-                  <Option name="alpha" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString"/>
-                    <Option name="type" value="3" type="int"/>
+                <Option value="" type="QString" name="name"/>
+                <Option type="Map" name="properties">
+                  <Option type="Map" name="alpha">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
                 </Option>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="103,34,144,26" 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="103,34,144,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="103,34,144,26" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="103,34,144,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="103,34,144,26" k="color"/>
@@ -32801,9 +33574,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32811,9 +33584,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32821,63 +33594,63 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.06"/>
+        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="int"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfAppendGeoreference" value="1" type="int"/>
-          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
-          <Option name="pdfExportThemes" value="" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="int"/>
-          <Option 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~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString"/>
-          <Option name="pdfLosslessImages" value="0" type="int"/>
-          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
-          <Option name="pdfSimplify" value="1" type="int"/>
-          <Option name="pdfTextFormat" value="0" type="int"/>
-          <Option name="singleFile" value="true" type="QString"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="int" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="1" type="int" name="pdfAppendGeoreference"/>
+          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="int" name="pdfIncludeMetadata"/>
+          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString" name="pdfLayerOrder"/>
+          <Option value="0" type="int" name="pdfLosslessImages"/>
+          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="int" name="pdfSimplify"/>
+          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="1" pageNameExpression="&quot;Distance&quot;" sortKey="&quot;Sort&quot;" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" enabled="1" hideCoverage="0" coverageLayerName="all_routes"/>
+      <Atlas sortFeatures="1" sortKey="&quot;Sort&quot;" filterFeatures="1" coverageLayerName="all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerProvider="ogr" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortAscending="1" enabled="1" hideCoverage="0" pageNameExpression="&quot;Distance&quot;"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="120" name="Marshal Plan A1" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="120" units="mm" name="Marshal Plan A1" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -32892,49 +33665,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" referencePoint="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" position="0,0,mm" blendMode="0" opacity="1" size="594,841,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="594,841,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -32949,9 +33722,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32959,15 +33732,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="25.5925,18.7971,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frame="false" equalColumnWidth="1" itemRotation="0" zValue="8" background="true" symbolWidth="7" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" blendMode="0" opacity="1" position="25.5925,18.7971,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="4,4,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem wrapChar="" columnSpace="2" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="25.5925,18.7971,mm" columnCount="1" opacity="1" frameJoinStyle="miter" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" type="65642" outlineWidthM="0.3,mm" zValue="8" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="4,4,mm" boxSpace="2" symbolWidth="7" minSymbolSize="0" position="25.5925,18.7971,mm" frame="false" symbolHeight="4" title="" referencePoint="0" positionLock="true" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="1" lineSpacing="1" resizeToContents="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" itemRotation="0" rasterBorder="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32975,37 +33748,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="1" indent="0" name="subgroup" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="1" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" name="symbol" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginTop="2" name="symbol">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" id="all_routes20170907054841602" patch_size="0,0" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="all_routes20170907054841602" legend_exp="" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString"/>
-                  <Option name="legend/node-order" value="1,2,3" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
-                  <Option name="showFeatureCount" value="0" type="QString"/>
+                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString" name="expandedLegendNodes"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option value="0" type="QString" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33013,47 +33786,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem id="" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" halign="1" referencePoint="0" labelText="MARSHAL POSITIONS" marginX="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" position="5.2963,808.939,mm" blendMode="0" opacity="1" size="91.9494,15.0649,mm" positionLock="true" positionOnPage="5.2963,808.939,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="7" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="7" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" labelText="MARSHAL POSITIONS" halign="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="91.9494,15.0649,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="5.2963,808.939,mm" type="65641" positionOnPage="5.2963,808.939,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="63" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33068,65 +33841,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" halign="2" referencePoint="0" labelText="REVISION 1.2" marginX="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" position="430.403,825.052,mm" blendMode="0" opacity="1" size="56.6212,15.3656,mm" positionLock="true" positionOnPage="430.403,825.052,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="5" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" labelText="REVISION 1.2" halign="2" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="56.6212,15.3656,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="430.403,825.052,mm" type="65641" positionOnPage="430.403,825.052,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33141,65 +33914,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{d177957c-7ab6-40ae-8769-347428500538}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" position="372.175,808.942,mm" blendMode="0" opacity="1" size="114.848,15.0635,mm" positionLock="true" positionOnPage="372.175,808.942,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="4" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="4" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{d177957c-7ab6-40ae-8769-347428500538}" labelText="Sunday, 20 October 2019" halign="2" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="114.848,15.0635,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="372.175,808.942,mm" type="65641" positionOnPage="372.175,808.942,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33214,39 +33987,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" referencePoint="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" position="489.557,775.395,mm" anchorPoint="8" blendMode="0" opacity="1" pictureHeight="63.9757" size="100.498,63.9757,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="489.557,775.395,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="63.5856" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../Gun_Run_Logo.png" zValue="3" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="63.5856" id="" pictureHeight="63.9757" frameJoinStyle="miter" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgFillColor="255,255,255,255" mapUuid="" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="100.498,63.9757,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="489.557,775.395,mm" type="65640" anchorPoint="8" positionOnPage="489.557,775.395,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33254,42 +34027,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" referencePoint="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" position="5.4463,824.155,mm" blendMode="0" opacity="1" size="481.428,0.606138,mm" positionLock="true" positionOnPage="5.4463,824.155,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="2" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="2" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" cornerRadiusMeasure="0,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="481.428,0.606138,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="5.4463,824.155,mm" type="65643" positionOnPage="5.4463,824.155,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -33304,90 +34077,90 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem id="" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" referencePoint="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" position="3.94474,5.25965,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="584.759,811.213,mm" mapFlags="0" positionLock="true" positionOnPage="3.94474,5.25965,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal plan" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="" frameJoinStyle="miter" isTemporal="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" followPresetName="Marshal plan" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="584.759,811.213,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="3.94474,5.25965,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="3.94474,5.25965,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37434415142052657" xmax="18.42299397558693741" ymax="-33.89072661913806428" ymin="-33.95821655848814657"/>
+        <Extent ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmax="18.42299397558693741" xmin="18.37434415142052657"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0"/>
+        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="QString"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
-          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortFeatures="1" coverageLayerProvider="virtual" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;page&quot;" sortKey="page" enabled="1" hideCoverage="1" coverageLayerName="complete_marshal_overview"/>
+      <Atlas sortFeatures="1" sortKey="page" filterFeatures="0" coverageLayerName="complete_marshal_overview" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="virtual" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortAscending="1" enabled="1" hideCoverage="1" pageNameExpression="&quot;page&quot;"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="144" name="Access Roads" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" units="mm" name="Access Roads" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -33402,49 +34175,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" referencePoint="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -33459,27 +34232,27 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" units="mm" page="0" orientation="2"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="244.484,130.172,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" frame="true" equalColumnWidth="0" itemRotation="0" zValue="15" background="true" symbolWidth="7" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" blendMode="0" opacity="1" position="244.484,130.172,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="34.45,40.8,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="185" red="255"/>
+      <LayoutItem wrapChar="" columnSpace="2" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="244.484,130.172,mm" columnCount="1" opacity="1" frameJoinStyle="miter" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" type="65642" outlineWidthM="0.3,mm" zValue="15" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="34.45,40.8,mm" boxSpace="2" symbolWidth="7" minSymbolSize="0" position="244.484,130.172,mm" frame="true" symbolHeight="4" title="" referencePoint="0" positionLock="true" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="0" lineSpacing="1" resizeToContents="1" itemRotation="0" rasterBorder="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="185"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33487,35 +34260,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="3" indent="0" name="group" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="3" name="group">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="3" indent="0" name="subgroup" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="3" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" underline="0" style="Regular" italic="0" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Residents Access" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Residents Access">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" expanded="1" providerKey="ogr" name="residents_access_roads" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33523,47 +34296,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem id="" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" halign="1" referencePoint="0" labelText="ACCESS ROUTES FOR RESIDENTS" marginX="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" position="9.37446,191.81,mm" blendMode="0" opacity="1" size="194.851,7.272,mm" positionLock="true" positionOnPage="9.37446,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="8" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="8" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" labelText="ACCESS ROUTES FOR RESIDENTS" halign="1" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="194.851,7.272,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="9.37446,191.81,mm" type="65641" positionOnPage="9.37446,191.81,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="14" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="14" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33578,65 +34351,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" halign="2" referencePoint="0" labelText="REVISION 1.1" marginX="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" position="204.225,191.81,mm" blendMode="0" opacity="1" size="57.4836,6.8714,mm" positionLock="true" positionOnPage="204.225,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="6" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="6" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" labelText="REVISION 1.1" halign="2" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="57.4836,6.8714,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="204.225,191.81,mm" type="65641" positionOnPage="204.225,191.81,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33651,65 +34424,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" position="210.038,199.082,mm" blendMode="0" opacity="1" size="51.6706,6.60801,mm" positionLock="true" positionOnPage="210.038,199.082,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="5" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="5" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" labelText="Sunday, 20 October 2019" halign="2" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="51.6706,6.60801,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="210.038,199.082,mm" type="65641" positionOnPage="210.038,199.082,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33724,39 +34497,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" referencePoint="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" position="262.196,188.218,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="17.4718" size="29.7523,17.4718,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="262.196,188.218,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="17.3653" groupUuid="" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../Gun_Run_Logo.png" zValue="4" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="17.3653" id="" pictureHeight="17.4718" frameJoinStyle="miter" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgFillColor="255,255,255,255" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="29.7523,17.4718,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="262.196,188.218,mm" type="65640" anchorPoint="4" positionOnPage="262.196,188.218,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33764,42 +34537,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" referencePoint="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" position="9.59946,198.832,mm" blendMode="0" opacity="1" size="251.959,0.1,mm" positionLock="true" positionOnPage="9.59946,198.832,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="3" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" cornerRadiusMeasure="0,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="251.959,0.1,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="9.59946,198.832,mm" type="65643" positionOnPage="9.59946,198.832,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -33814,61 +34587,61 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem id="" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" referencePoint="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" position="5.86559,4.09761,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="67.7828,166.874,mm" mapFlags="0" positionLock="true" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Access Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="2" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="2" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="" frameJoinStyle="miter" isTemporal="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" followPresetName="Access Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="67.7828,166.874,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="5.86559,4.09761,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMax">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMax">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" xmax="18.38563681624126289" ymax="-33.91513741583252539" ymin="-33.94652930000000168"/>
+        <Extent ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121"/>
         <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>
@@ -33883,45 +34656,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -33952,44 +34725,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -34012,40 +34785,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -34060,29 +34833,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34090,45 +34863,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" referencePoint="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" position="9.44946,9.08557,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="282.012,175.592,mm" mapFlags="0" positionLock="true" positionOnPage="9.44946,9.08557,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="round" visibility="1" drawCanvasItems="false" followPresetName="Access Routes" outlineWidthM="0.15,mm" frame="true" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="" frameJoinStyle="round" isTemporal="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" followPresetName="Access Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.15,mm" size="282.012,175.592,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="9.44946,9.08557,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="9.44946,9.08557,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" xmax="18.42303507276415431" ymax="-33.89697816224119009" ymin="-33.92999999999999972"/>
+        <Extent ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmax="18.42303507276415431" xmin="18.37000000000000099"/>
         <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>
@@ -34143,45 +34916,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -34212,44 +34985,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -34272,40 +35045,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -34320,29 +35093,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34350,56 +35123,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="QString"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
-          <Option name="pdfTextFormat" value="0" type="QString"/>
-          <Option name="singleFile" value="false" type="QString"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="false" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" enabled="1" hideCoverage="1" coverageLayerName="residents_access"/>
+      <Atlas sortFeatures="0" filterFeatures="0" coverageLayerName="residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="1" hideCoverage="1" pageNameExpression="&quot;FID&quot;"/>
     </Layout>
-    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" printResolution="144" name="Golf Course Access" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" units="mm" name="Golf Course Access" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -34414,49 +35187,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" referencePoint="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -34471,59 +35244,59 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" units="mm" page="0" orientation="2"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem id="" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" halign="1" referencePoint="0" labelText="Access to P9 Parking and VIP Tent" marginX="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" position="9.37446,191.81,mm" blendMode="0" opacity="1" size="194.851,7.272,mm" positionLock="true" positionOnPage="9.37446,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="8" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="8" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" labelText="Access to P9 Parking and VIP Tent" halign="1" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="194.851,7.272,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="9.37446,191.81,mm" type="65641" positionOnPage="9.37446,191.81,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="14" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="14" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34538,65 +35311,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" halign="2" referencePoint="0" labelText="REVISION 1.0" marginX="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" position="204.225,191.81,mm" blendMode="0" opacity="1" size="57.4836,6.8714,mm" positionLock="true" positionOnPage="204.225,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="6" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="6" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" labelText="REVISION 1.0" halign="2" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="57.4836,6.8714,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="204.225,191.81,mm" type="65641" positionOnPage="204.225,191.81,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34611,65 +35384,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" position="210.038,199.082,mm" blendMode="0" opacity="1" size="51.6706,6.60801,mm" positionLock="true" positionOnPage="210.038,199.082,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="5" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="5" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" labelText="Sunday, 20 October 2019" halign="2" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="51.6706,6.60801,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="210.038,199.082,mm" type="65641" positionOnPage="210.038,199.082,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34684,39 +35457,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" referencePoint="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" position="262.196,188.218,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="17.4718" size="29.7523,17.4718,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="262.196,188.218,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="17.3653" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../Gun_Run_Logo.png" zValue="4" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="17.3653" id="" pictureHeight="17.4718" frameJoinStyle="miter" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgFillColor="255,255,255,255" mapUuid="" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="29.7523,17.4718,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="262.196,188.218,mm" type="65640" anchorPoint="4" positionOnPage="262.196,188.218,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34724,42 +35497,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" referencePoint="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" position="9.59946,198.832,mm" blendMode="0" opacity="1" size="251.959,0.1,mm" positionLock="true" positionOnPage="9.59946,198.832,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="3" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" cornerRadiusMeasure="0,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="251.959,0.1,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="9.59946,198.832,mm" type="65643" positionOnPage="9.59946,198.832,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -34774,46 +35547,46 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem id="" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" referencePoint="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" position="9.44946,7.25098,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="282.012,182.649,mm" mapFlags="0" positionLock="false" positionOnPage="9.44946,7.25098,mm" keepLayerSet="false" groupUuid="" followPreset="false" excludeFromExports="0" background="true" frameJoinStyle="round" visibility="1" drawCanvasItems="false" followPresetName="" outlineWidthM="0.15,mm" frame="false" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="false" positionLock="false" mapRotation="0" id="" frameJoinStyle="round" isTemporal="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" followPresetName="" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.15,mm" size="282.012,182.649,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="9.44946,7.25098,mm" type="65639" followPreset="false" labelMargin="0,mm" positionOnPage="9.44946,7.25098,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40103928699269886" xmax="18.40919746780259914" ymax="-33.90319854486631357" ymin="-33.90848231674397084"/>
+        <Extent ymin="-33.90848231674397084" ymax="-33.90319854486631357" xmax="18.40919746780259914" xmin="18.40103928699269886"/>
         <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>
@@ -34828,45 +35601,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -34897,44 +35670,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -34957,40 +35730,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -35005,29 +35778,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35035,56 +35808,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="QString"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
-          <Option name="pdfTextFormat" value="0" type="QString"/>
-          <Option name="singleFile" value="false" type="QString"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="false" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" enabled="0" hideCoverage="1" coverageLayerName="residents_access"/>
+      <Atlas sortFeatures="0" filterFeatures="0" coverageLayerName="residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="0" hideCoverage="1" pageNameExpression="&quot;FID&quot;"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="120" name="Marshal Plan" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="120" units="mm" name="Marshal Plan" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -35099,49 +35872,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" referencePoint="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" position="0,0,mm" blendMode="0" opacity="1" size="297,420,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,420,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -35156,9 +35929,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35166,47 +35939,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem id="" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" halign="4" referencePoint="0" labelText="Page [% &quot;page&quot; %] " marginX="0" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" position="112.086,406.476,mm" blendMode="0" opacity="1" size="23.5967,8.3142,mm" positionLock="true" positionOnPage="112.086,406.476,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="9" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="9" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" labelText="Page [% &quot;page&quot; %] " halign="4" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" marginY="1" htmlState="1" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="23.5967,8.3142,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="112.086,406.476,mm" type="65641" positionOnPage="112.086,406.476,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35221,65 +35994,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" halign="2" referencePoint="0" labelText="REVISION 4.1" marginX="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" position="214.292,406.874,mm" blendMode="0" opacity="1" size="27.7839,7.51682,mm" positionLock="true" positionOnPage="214.292,406.874,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="8" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="8" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" labelText="REVISION 4.1" halign="2" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="27.7839,7.51682,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="214.292,406.874,mm" type="65641" positionOnPage="214.292,406.874,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35294,33 +36067,33 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="15.6525,12.5708,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frame="false" equalColumnWidth="1" itemRotation="0" zValue="7" background="true" symbolWidth="7" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" blendMode="0" opacity="1" position="15.6525,12.5708,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="21.6797,33,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem wrapChar="" columnSpace="2" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="15.6525,12.5708,mm" columnCount="1" opacity="1" frameJoinStyle="miter" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" type="65642" outlineWidthM="0.3,mm" zValue="7" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="21.6797,33,mm" boxSpace="2" symbolWidth="7" minSymbolSize="0" position="15.6525,12.5708,mm" frame="false" symbolHeight="4" title="" referencePoint="0" positionLock="true" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="1" lineSpacing="1" resizeToContents="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" itemRotation="0" rasterBorder="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35328,37 +36101,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="1" indent="0" name="subgroup" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="1" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" name="symbol" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginTop="2" name="symbol">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
-                  <Option name="showFeatureCount" value="0" type="int"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option value="0" type="int" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -35366,47 +36139,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem id="" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" halign="1" referencePoint="0" labelText="MARSHAL POSITIONS" marginX="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" position="5.69321,398.344,mm" blendMode="0" opacity="1" size="45.1194,8.13137,mm" positionLock="true" positionOnPage="5.69321,398.344,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="6" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="6" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" labelText="MARSHAL POSITIONS" halign="1" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="45.1194,8.13137,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="5.69321,398.344,mm" type="65641" positionOnPage="5.69321,398.344,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="63" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35421,65 +36194,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" halign="1" referencePoint="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" marginX="0" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" position="5.69321,406.988,mm" blendMode="0" opacity="1" size="118.192,7.80192,mm" positionLock="true" positionOnPage="5.69321,406.988,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="5" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" halign="1" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" marginY="1" htmlState="1" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="118.192,7.80192,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="5.69321,406.988,mm" type="65641" positionOnPage="5.69321,406.988,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35494,65 +36267,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" halign="2" referencePoint="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" marginX="0" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" position="148.501,398.344,mm" blendMode="0" opacity="1" size="93.5757,8.13167,mm" positionLock="true" positionOnPage="148.501,398.344,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="4" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="4" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" halign="2" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" marginY="1" htmlState="1" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="93.5757,8.13167,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="148.501,398.344,mm" type="65641" positionOnPage="148.501,398.344,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35567,39 +36340,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" referencePoint="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" position="243.319,382.696,mm" anchorPoint="8" blendMode="0" opacity="1" pictureHeight="26.4325" size="49.3143,31.2967,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="243.319,382.696,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_250.png" pictureWidth="49.3143" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../GunRun2022_250.png" zValue="3" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="49.3143" id="" pictureHeight="26.4325" frameJoinStyle="miter" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgFillColor="255,255,255,255" mapUuid="" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="49.3143,31.2967,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="243.319,382.696,mm" type="65640" anchorPoint="8" positionOnPage="243.319,382.696,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35607,42 +36380,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" referencePoint="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" position="5.84321,406.626,mm" blendMode="0" opacity="1" size="236.083,0.14328,mm" positionLock="true" positionOnPage="5.84321,406.626,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="2" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="2" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" cornerRadiusMeasure="0,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="236.083,0.14328,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="5.84321,406.626,mm" type="65643" positionOnPage="5.84321,406.626,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -35657,78 +36430,1479 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem id="" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" referencePoint="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" position="5.03,5.9483,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="286.94,392.396,mm" mapFlags="0" positionLock="true" positionOnPage="5.03,5.9483,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal plan" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="false" positionLock="true" mapRotation="0" id="" frameJoinStyle="miter" isTemporal="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" followPresetName="Marshal plan" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="286.94,392.396,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="5.03,5.9483,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="5.03,5.9483,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39785407807089612" xmax="18.41474568521422484" ymax="-33.89580042337001231" ymin="-33.91890002608484167"/>
+        <Extent ymin="-33.94797288016832226" ymax="-33.9248732774534929" xmax="18.38613924055453452" xmin="18.36924763341120581"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0"/>
+        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="int"/>
-          <Option name="pdfAppendGeoreference" value="1" type="int"/>
-          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
-          <Option name="pdfExportThemes" value="" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="int"/>
-          <Option 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~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString"/>
-          <Option name="pdfLosslessImages" value="0" type="int"/>
-          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
-          <Option name="pdfSimplify" value="1" type="int"/>
-          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="int" name="forceVector"/>
+          <Option value="1" type="int" name="pdfAppendGeoreference"/>
+          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="int" name="pdfIncludeMetadata"/>
+          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString" name="pdfLayerOrder"/>
+          <Option value="0" type="int" name="pdfLosslessImages"/>
+          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="int" name="pdfSimplify"/>
+          <Option value="0" type="int" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;page&quot;" sortKey="page" enabled="1" hideCoverage="1" coverageLayerName="marshal_overviews"/>
+      <Atlas sortFeatures="1" sortKey="page" filterFeatures="0" coverageLayerName="marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="ogr" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortAscending="1" enabled="1" hideCoverage="1" pageNameExpression="&quot;page&quot;"/>
+    </Layout>
+    <Layout printResolution="300" units="mm" name="Fencing - Cones only" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
+      <PageCollection>
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <Option type="Map">
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
+            </Option>
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="255,255,255,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.26" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+          </layer>
+        </symbol>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+          <LayoutObject>
+            <dataDefinedProperties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </dataDefinedProperties>
+            <customproperties>
+              <Option/>
+            </customproperties>
+          </LayoutObject>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
+              </Option>
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </LayoutItem>
+        <GuideCollection visible="1"/>
+      </PageCollection>
+      <LayoutItem wrapChar="" columnSpace="2" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="256.808,5.21277,mm" columnCount="1" opacity="1" frameJoinStyle="miter" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" type="65642" outlineWidthM="0.3,mm" zValue="11" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="38.1563,53.7608,mm" boxSpace="2" symbolWidth="7" minSymbolSize="0" position="256.808,5.21277,mm" frame="true" symbolHeight="4" title="" referencePoint="0" positionLock="true" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="1" lineSpacing="1" resizeToContents="0" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" itemRotation="0" rasterBorder="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <styles>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" bold="1" underline="0" style="Bold" italic="0" strikethrough="0"/>
+          </style>
+          <style indent="0" alignment="1" marginTop="3" name="group">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
+          </style>
+          <style indent="0" alignment="1" marginTop="3" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
+          </style>
+          <style indent="0" alignment="1" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          </style>
+          <style indent="0" alignment="1" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" underline="0" style="Regular" italic="0" strikethrough="0"/>
+          </style>
+        </styles>
+        <layer-tree-group>
+          <customproperties>
+            <Option/>
+          </customproperties>
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Fencing and Cones">
+            <customproperties>
+              <Option/>
+            </customproperties>
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="fencing" source="./fencing.shp|layername=fencing">
+              <customproperties>
+                <Option type="Map">
+                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
+                  <Option value="" type="QString" name="legend/expressionFilter"/>
+                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+                  <Option value="1,4" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                </Option>
+              </customproperties>
+            </layer-tree-layer>
+          </layer-tree-group>
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+            <customproperties>
+              <Option/>
+            </customproperties>
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
+              <customproperties>
+                <Option type="Map">
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option value="0" type="int" name="showFeatureCount"/>
+                </Option>
+              </customproperties>
+            </layer-tree-layer>
+          </layer-tree-group>
+          <custom-order enabled="0"/>
+        </layer-tree-group>
+      </LayoutItem>
+      <LayoutItem zValue="10" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" labelText="CONES: [% &quot;name&quot; %]" halign="1" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="148.46,6.45211,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="6.76779,191.188,mm" type="65641" positionOnPage="6.76779,191.188,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="63" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem zValue="9" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" halign="2" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" marginY="0" htmlState="1" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="56.3557,6.45237,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="182.723,191.188,mm" type="65641" positionOnPage="182.723,191.188,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem zValue="8" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" labelText="REVISION 2.1" halign="2" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="26.8205,6.82826,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="209.146,198.083,mm" type="65641" positionOnPage="209.146,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem zValue="7" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" halign="1" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="51.1638,7.07327,mm" valign="32" excludeFromExports="0" visibility="0" blendMode="0" marginX="1" opacity="1" groupUuid="" position="62.6706,198.083,mm" type="65641" positionOnPage="62.6706,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem zValue="6" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" halign="1" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="64.7594,7.10512,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="116.805,198.083,mm" type="65641" positionOnPage="116.805,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem zValue="5" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" labelText="Page [% @atlas_featurenumber %]" halign="1" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="90.2083,7.07327,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="6.76779,198.083,mm" type="65641" positionOnPage="6.76779,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem file="../GunRun2022_250.png" zValue="4" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="49.3143" id="" pictureHeight="26.4325" frameJoinStyle="miter" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" svgFillColor="255,255,255,255" mapUuid="" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="49.3143,29.8354,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="243.098,175.353,mm" type="65640" anchorPoint="8" positionOnPage="243.098,175.353,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
+                </Option>
+              </Option>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutItem>
+      <LayoutItem zValue="3" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" cornerRadiusMeasure="0,mm" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="232.01,0.14328,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="6.91779,197.79,mm" type="65643" positionOnPage="6.91779,197.79,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <Option type="Map">
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
+            </Option>
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="solid" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+          </layer>
+        </symbol>
+      </LayoutItem>
+      <LayoutItem numSubdivisions="1" groupUuid="" background="false" outlineWidth="0.2" lineJoinStyle="round" positionOnPage="6.76779,2.8482,mm" unitType="meters" labelHorizontalPlacement="0" unitLabel="m" opacity="1" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" blendMode="0" alignment="0" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" minBarWidth="25" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" type="65646" labelBarSpace="1" lineCapStyle="square" outlineWidthM="0.3,mm" zValue="2" excludeFromExports="0" id="" numSegmentsLeft="2" size="106.045,15.8378,mm" position="6.76779,2.8482,mm" labelVerticalPlacement="0" frame="false" numUnitsPerSegment="20" referencePoint="0" positionLock="true" height="2" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" numSegments="2" visibility="1" segmentMillimeters="32.0947" style="Double Box" subdivisionsHeight="1.5" itemRotation="0" maxBarWidth="100" segmentSizeMode="1" boxContentSpace="0.2">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+        <strokeColor red="0" green="0" blue="0" alpha="255"/>
+        <numericFormat id="basic">
+          <Option type="Map">
+            <Option value="" type="QChar" name="decimal_separator"/>
+            <Option value="6" type="int" name="decimals"/>
+            <Option value="0" type="int" name="rounding_type"/>
+            <Option value="false" type="bool" name="show_plus"/>
+            <Option value="true" type="bool" name="show_thousand_separator"/>
+            <Option value="false" type="bool" name="show_trailing_zeros"/>
+            <Option value="" type="QChar" name="thousand_separator"/>
+          </Option>
+        </numericFormat>
+        <fillColor red="0" green="0" blue="0" alpha="255"/>
+        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <lineSymbol>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+              </Option>
+              <prop v="0" k="align_dash_pattern"/>
+              <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"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="dash_pattern_offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+              <prop v="MM" k="dash_pattern_offset_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="trim_distance_end"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_end_unit"/>
+              <prop v="0" k="trim_distance_start"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_start_unit"/>
+              <prop v="0" k="tweak_dash_pattern_on_corners"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </lineSymbol>
+        <divisionLineSymbol>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+              </Option>
+              <prop v="0" k="align_dash_pattern"/>
+              <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"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="dash_pattern_offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+              <prop v="MM" k="dash_pattern_offset_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="trim_distance_end"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_end_unit"/>
+              <prop v="0" k="trim_distance_start"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_start_unit"/>
+              <prop v="0" k="tweak_dash_pattern_on_corners"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </divisionLineSymbol>
+        <subdivisionLineSymbol>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+              </Option>
+              <prop v="0" k="align_dash_pattern"/>
+              <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"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="dash_pattern_offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+              <prop v="MM" k="dash_pattern_offset_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="trim_distance_end"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_end_unit"/>
+              <prop v="0" k="trim_distance_start"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_start_unit"/>
+              <prop v="0" k="tweak_dash_pattern_on_corners"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </subdivisionLineSymbol>
+        <fillSymbol1>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
+              </Option>
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </fillSymbol1>
+        <fillSymbol2>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
+              </Option>
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </fillSymbol2>
+      </LayoutItem>
+      <LayoutItem zValue="1" mapFlags="0" frame="false" positionLock="true" mapRotation="0" id="" frameJoinStyle="miter" isTemporal="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" followPresetName="Fencing" background="false" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="283.418,180.92,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="0.9" groupUuid="" position="6.76779,9.35102,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option type="Map" name="transformer">
+                    <Option type="Map" name="d">
+                      <Option value="1" type="double" name="exponent"/>
+                      <Option value="360" type="double" name="maxOutput"/>
+                      <Option value="0" type="double" name="maxValue"/>
+                      <Option value="0" type="double" name="minOutput"/>
+                      <Option value="0" type="double" name="minValue"/>
+                      <Option value="0" type="double" name="nullOutput"/>
+                    </Option>
+                    <Option value="0" type="int" name="t"/>
+                  </Option>
+                  <Option value="3" type="int" name="type"/>
+                </Option>
+                <Option type="Map" name="dataDefinedRotation">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="angle" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
+                </Option>
+              </Option>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.90819730717829827" ymax="-33.90718453497861162" xmax="18.40524827801807461" xmin="18.40366172969380543"/>
+        <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>
+            <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>
+        </crs>
+        <LayerSet/>
+        <ComposerMapGrid rightAnnotationDisplay="3" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="1" gridFrameMargin="0" annotationFormat="4" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="3" annotationExpression="" intervalY="5" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="5" bottomAnnotationDisplay="3" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
+          <lineStyle>
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="195,195,195,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                </Option>
+                <prop v="0" k="align_dash_pattern"/>
+                <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"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="dash_pattern_offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+                <prop v="MM" k="dash_pattern_offset_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="195,195,195,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="trim_distance_end"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_end_unit"/>
+                <prop v="0" k="trim_distance_start"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_start_unit"/>
+                <prop v="0" k="tweak_dash_pattern_on_corners"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </lineStyle>
+          <markerStyle>
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                </Option>
+                <prop v="0" k="angle"/>
+                <prop v="square" k="cap_style"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </markerStyle>
+          <spatialrefsys nativeFormat="Wkt">
+            <wkt>PROJCRS["WGS 84 / Pseudo-Mercator",BASEGEOGCRS["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]],ID["EPSG",4326]],CONVERSION["Popular Visualisation Pseudo-Mercator",METHOD["Popular Visualisation Pseudo Mercator",ID["EPSG",1024]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["False easting",0,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Web mapping and visualisation."],AREA["World between 85.06°S and 85.06°N."],BBOX[-85.06,-180,85.06,180]],ID["EPSG",3857]]</wkt>
+            <proj4>+proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +wktext +no_defs</proj4>
+            <srsid>3857</srsid>
+            <srid>3857</srid>
+            <authid>EPSG:3857</authid>
+            <description>WGS 84 / Pseudo-Mercator</description>
+            <projectionacronym>merc</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>false</geographicflag>
+          </spatialrefsys>
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+            <families/>
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <Option type="Map">
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
+                  </Option>
+                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                  <prop v="255,255,255,255" k="color"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="128,128,128,255" k="outline_color"/>
+                  <prop v="no" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="solid" k="style"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option value="" type="QString" name="name"/>
+                      <Option name="properties"/>
+                      <Option value="collection" type="QString" name="type"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </background>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+            <dd_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </dd_properties>
+          </text-style>
+          <LayoutObject>
+            <dataDefinedProperties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </dataDefinedProperties>
+            <customproperties>
+              <Option/>
+            </customproperties>
+          </LayoutObject>
+        </ComposerMapGrid>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
+      </LayoutItem>
+      <customproperties>
+        <Option type="Map">
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="int" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="1" type="int" name="pdfAppendGeoreference"/>
+          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
+          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="int" name="pdfIncludeMetadata"/>
+          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_5655c566_c302_4743_a580_b3593f83c018" type="QString" name="pdfLayerOrder"/>
+          <Option value="0" type="int" name="pdfLosslessImages"/>
+          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="int" name="pdfSimplify"/>
+          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="rasterize"/>
+          <Option value="true" type="bool" name="singleFile"/>
+        </Option>
+      </customproperties>
+      <Atlas sortFeatures="1" sortKey="&quot;group&quot;" filterFeatures="0" coverageLayerName="cone_only_groups" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="virtual" coverageLayer="cone_only_groups_5655c566_c302_4743_a580_b3593f83c018" 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'fenc%25'%20GROUP%20BY%20%22group%22" sortAscending="1" enabled="1" hideCoverage="1" pageNameExpression="&quot;name&quot;"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings rotation="0" UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmin="18.38171185633030547" xmax="18.43166587763301578" ymax="-33.89601380088749494" ymin="-33.92288495502011614">
+    <DefaultViewExtent ymin="-33.90890360779818025" ymax="-33.9021858192650285" xmax="18.4213002576920708" xmin="18.40881175236639322">
       <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>
@@ -35742,41 +37916,41 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1">
+  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStepUnit="h" frameRate="1" timeStep="1" cumulativeTemporalRange="0"/>
+  <ProjectTimeSettings timeStepUnit="h" timeStep="1" frameRate="1" cumulativeTemporalRange="0"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider offset="0" scale="1"/>
+      <TerrainProvider scale="1" offset="0"/>
     </terrainProvider>
   </ElevationProperties>
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option name="decimal_separator" value="" type="QChar"/>
-        <Option name="decimals" value="6" type="int"/>
-        <Option name="direction_format" value="0" type="int"/>
-        <Option name="rounding_type" value="0" type="int"/>
-        <Option name="show_plus" value="false" type="bool"/>
-        <Option name="show_thousand_separator" value="true" type="bool"/>
-        <Option name="show_trailing_zeros" value="false" type="bool"/>
-        <Option name="thousand_separator" value="" type="QChar"/>
+        <Option value="" type="QChar" name="decimal_separator"/>
+        <Option value="6" type="int" name="decimals"/>
+        <Option value="0" type="int" name="direction_format"/>
+        <Option value="0" type="int" name="rounding_type"/>
+        <Option value="false" type="bool" name="show_plus"/>
+        <Option value="true" type="bool" name="show_thousand_separator"/>
+        <Option value="false" type="bool" name="show_trailing_zeros"/>
+        <Option value="" type="QChar" name="thousand_separator"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option name="angle_format" value="DecimalDegrees" type="QString"/>
-        <Option name="decimal_separator" value="" type="QChar"/>
-        <Option name="decimals" value="6" type="int"/>
-        <Option name="rounding_type" value="0" type="int"/>
-        <Option name="show_leading_degree_zeros" value="false" type="bool"/>
-        <Option name="show_leading_zeros" value="false" type="bool"/>
-        <Option name="show_plus" value="false" type="bool"/>
-        <Option name="show_suffix" value="false" type="bool"/>
-        <Option name="show_thousand_separator" value="true" type="bool"/>
-        <Option name="show_trailing_zeros" value="false" type="bool"/>
-        <Option name="thousand_separator" value="" type="QChar"/>
+        <Option value="DecimalDegrees" type="QString" name="angle_format"/>
+        <Option value="" type="QChar" name="decimal_separator"/>
+        <Option value="6" type="int" name="decimals"/>
+        <Option value="0" type="int" name="rounding_type"/>
+        <Option value="false" type="bool" name="show_leading_degree_zeros"/>
+        <Option value="false" type="bool" name="show_leading_zeros"/>
+        <Option value="false" type="bool" name="show_plus"/>
+        <Option value="false" type="bool" name="show_suffix"/>
+        <Option value="true" type="bool" name="show_thousand_separator"/>
+        <Option value="false" type="bool" name="show_trailing_zeros"/>
+        <Option value="" type="QChar" name="thousand_separator"/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index f1d21b8..05afd68 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 saveDateTime="2022-09-12T08:32:26" projectname="Gun Run" version="3.26.3-Buenos Aires" saveUserFull="Timothy Allen" saveUser="tim">
+<qgis saveUser="tim" projectname="Gun Run" saveDateTime="2022-09-13T09:48:41" saveUserFull="Timothy Allen" version="3.26.3-Buenos Aires">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,251 +21,256 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group checked="Qt::Checked" expanded="1" name="Marshals" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Marshals">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0" expanded="1" providerKey="ogr" name="marshal_positions" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="marshal_positions" source="./marshal_positions.shp|layername=marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="marshal_positions [460]" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option name="legend/expressionFilter" value="" type="QString"/>
-            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
-            <Option name="showFeatureCount" value="1" type="int"/>
+            <Option value="marshal_positions [460]" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option value="1" type="int" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./extra_security.shp" checked="Qt::Unchecked" id="extra_security20170921130834191" patch_size="0,0" expanded="1" providerKey="ogr" name="extra_security" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="extra_security20170921130834191" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="extra_security" 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 source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" id="marshals_by_position20161003112326575" patch_size="0,0" expanded="1" providerKey="delimitedtext" name="marshals_by_position" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="marshals_by_position20161003112326575" legend_exp="" providerKey="delimitedtext" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="marshals_by_position" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="marshals_by_position" type="QString"/>
+            <Option value="marshals_by_position" type="QString" name="cached_name"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0" expanded="1" providerKey="virtual" name="complete_marshal_overview" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_exp="" providerKey="virtual" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="complete_marshal_overview" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0" expanded="0" providerKey="ogr" name="marshal_overviews" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_exp="" providerKey="ogr" expanded="0" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="marshal_overviews" source="./marshal overviews.shp|layername=marshal overviews">
         <customproperties>
           <Option type="Map">
-            <Option name="legend/expressionFilter" value="" type="QString"/>
-            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" expanded="1" name="Fencing and Cones" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Fencing and Cones">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" expanded="1" providerKey="ogr" name="fencing" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="fencing" source="./fencing.shp|layername=fencing">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="fencing" type="QString"/>
-            <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
-            <Option name="legend/expressionFilter" value="" type="QString"/>
-            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+            <Option value="fencing" type="QString" name="cached_name"/>
+            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" patch_size="-1,-1" expanded="1" providerKey="virtual" name="fence_groups" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="cone_only_groups_5655c566_c302_4743_a580_b3593f83c018" legend_exp="" providerKey="virtual" expanded="1" patch_size="-1,-1" checked="Qt::Unchecked" legend_split_behavior="0" name="cone_only_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'fenc%25'%20GROUP%20BY%20%22group%22">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" legend_exp="" providerKey="virtual" expanded="1" patch_size="-1,-1" checked="Qt::Unchecked" legend_split_behavior="0" name="fence_and_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],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group checked="Qt::Checked" expanded="1" name="Markers" groupLayer="">
+      <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Markers">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={ec24be51-a272-427e-8ee9-16cf66eedb24}" checked="Qt::Checked" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" patch_size="-1,-1" expanded="1" providerKey="memory" name="route_markers" legend_split_behavior="0" legend_exp="">
+        <layer-tree-layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" legend_exp="" providerKey="memory" expanded="1" patch_size="-1,-1" checked="Qt::Checked" legend_split_behavior="0" name="route_markers" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={c0adcfec-e05c-4a4f-bfa7-86263dc9029e}">
           <customproperties>
             <Option type="Map">
-              <Option name="cached_name" value="route_markers" type="QString"/>
+              <Option value="route_markers" type="QString" name="cached_name"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="all_routes" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option name="showFeatureCount" value="0" type="int"/>
+            <Option value="all_routes" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="0" type="int" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer 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" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0" expanded="0" providerKey="ogr" name="timelapse" legend_split_behavior="0" legend_exp="">
+    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_exp="" providerKey="ogr" expanded="0" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="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' ">
       <customproperties>
         <Option type="Map">
-          <Option name="cached_name" value="timelapse" type="QString"/>
+          <Option value="timelapse" type="QString" name="cached_name"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group checked="Qt::Checked" expanded="1" name="Feeding Stations" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Feeding Stations">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./water_tables.shp" checked="Qt::Checked" id="water_tables20170921142016467" patch_size="0,0" expanded="1" providerKey="ogr" name="water_tables" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="water_tables20170921142016467" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="water_tables" source="./water_tables.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="water_tables" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option value="water_tables" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Ask Me" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="0" checked="Qt::Unchecked" name="Ask Me">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" expanded="1" providerKey="ogr" name="poi_labels" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="poi_labels" type="QString"/>
+            <Option value="poi_labels" type="QString" name="cached_name"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" expanded="1" providerKey="ogr" name="directions_to_start" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="directions_to_start" type="QString"/>
+            <Option value="directions_to_start" type="QString" name="cached_name"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Residents Access" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="0" checked="Qt::Unchecked" name="Residents Access">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./mayor.shp" checked="Qt::Unchecked" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0" expanded="1" providerKey="ogr" name="mayor" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="mayor" source="./mayor.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="mayor" type="QString"/>
+            <Option value="mayor" type="QString" name="cached_name"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./viplabels.shp" checked="Qt::Unchecked" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0" expanded="1" providerKey="ogr" name="viplabels" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="viplabels" source="./viplabels.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="viplabels" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option value="viplabels" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./vipaccess.shp" checked="Qt::Unchecked" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0" expanded="1" providerKey="ogr" name="vipaccess" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="vipaccess" source="./vipaccess.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="vipaccess" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option value="vipaccess" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./golfaccess.shp" checked="Qt::Unchecked" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0" expanded="0" providerKey="ogr" name="golfaccess" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_exp="" providerKey="ogr" expanded="0" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="golfaccess" source="./golfaccess.shp">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" expanded="1" providerKey="ogr" name="residents_access_roads" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="residents_access_roads" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option value="residents_access_roads" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0" expanded="1" providerKey="ogr" name="residents_access" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="residents_access" source="./residents_access.shp|layername=residents_access">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" expanded="1" name="OSM data" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="OSM data">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./osm_roads.shp" checked="Qt::Checked" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0" expanded="0" providerKey="ogr" name="osm_roads" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_exp="" providerKey="ogr" expanded="0" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="osm_roads" source="./osm_roads.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="osm_roads [3887]" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option name="showFeatureCount" value="1" type="QString"/>
+            <Option value="osm_roads [3887]" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0" expanded="1" providerKey="ogr" name="osm_places" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="osm_places" source="./osm_places.shp|layername=osm_places">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="osm_places [7]" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option name="showFeatureCount" value="1" type="QString"/>
+            <Option value="osm_places [7]" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" expanded="1" name="Start and Finish pages" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Unchecked" name="Start and Finish pages">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./data-comments.shp" checked="Qt::Unchecked" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0" expanded="1" providerKey="ogr" name="data-comments" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="data-comments" 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 source="./start_finish_area.shp" checked="Qt::Unchecked" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0" expanded="1" providerKey="ogr" name="start_finish_area" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="start_finish_area" 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 checked="Qt::Unchecked" expanded="0" name="Elevation" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="0" checked="Qt::Unchecked" name="Elevation">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./capetownelevation-1m.shp" checked="Qt::Unchecked" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0" expanded="1" providerKey="ogr" name="capetownelevation-1m" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Unchecked" legend_split_behavior="0" name="capetownelevation-1m" source="./capetownelevation-1m.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="showFeatureCount" value="1" type="QString"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" expanded="1" name="Map" groupLayer="">
+    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Map">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0" expanded="0" providerKey="gdal" name="GDAL-City of Cape Town 2015 Aerial" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_exp="" providerKey="gdal" expanded="0" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="GDAL-City of Cape Town 2015 Aerial" source="./GDAL-City of Cape Town 2015 Aerial.xml">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="GDAL-City of Cape Town 2015 Aerial" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option value="GDAL-City of Cape Town 2015 Aerial" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer 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" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0" expanded="1" providerKey="wms" name="Outlines" legend_split_behavior="0" legend_exp="">
+      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" legend_exp="" providerKey="wms" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="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">
         <customproperties>
           <Option type="Map">
-            <Option name="cached_name" value="Outlines" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option value="Outlines" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -296,44 +301,46 @@
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
       <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
       <item>route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e</item>
+      <item>cone_only_groups_5655c566_c302_4743_a580_b3593f83c018</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings intersection-snapping="1" tolerance="10" mode="3" scaleDependencyMode="0" enabled="0" type="1" minScale="0" unit="1" self-snapping="1" maxScale="0">
+  <snapping-settings tolerance="10" unit="1" intersection-snapping="1" mode="3" minScale="0" scaleDependencyMode="0" maxScale="0" enabled="0" self-snapping="1" type="1">
     <individual-layer-settings>
-      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" tolerance="12" enabled="0" type="0" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" tolerance="12" enabled="0" type="0" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="water_tables20170921142016467" tolerance="0" enabled="0" type="2" units="2" minScale="0" maxScale="0"/>
-      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" enabled="1" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
-      <layer-setting id="extra_security20170921130834191" tolerance="0" enabled="0" type="2" units="2" minScale="0" maxScale="0"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="0"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="cone_only_groups_5655c566_c302_4743_a580_b3593f83c018" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="0"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="0"/>
+      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="1"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" minScale="0" maxScale="0" enabled="1" units="1" type="2"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="1"/>
+      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="1"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="water_tables20170921142016467" tolerance="0" minScale="0" maxScale="0" enabled="0" units="2" type="2"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="1"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" minScale="0" maxScale="0" enabled="0" units="1" type="2"/>
+      <layer-setting id="extra_security20170921130834191" tolerance="0" minScale="0" maxScale="0" enabled="0" units="2" type="2"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <polymorphicRelations/>
-  <mapcanvas name="theMapCanvas" annotationsVisible="1">
+  <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.37956087983462439</xmin>
-      <ymin>-33.9203851584736924</ymin>
-      <xmax>18.4295149011373347</xmax>
-      <ymax>-33.89421164444254941</ymax>
+      <xmin>18.40881175236639322</xmin>
+      <ymin>-33.90881640278549725</ymin>
+      <xmax>18.4213002576920708</xmax>
+      <ymax>-33.9022730242777115</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -354,161 +361,166 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup checked="Qt::Checked" open="true" name="Marshals">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="marshal_positions" showFeatureCount="1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <legendgroup checked="Qt::Checked" name="Marshals" open="true">
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" name="marshal_positions" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="extra_security" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="extra_security" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="marshals_by_position" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="marshals_by_position" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="complete_marshal_overview" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="complete_marshal_overview" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="marshal_overviews" showFeatureCount="0">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="marshal_overviews" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="true" name="Fencing and Cones">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="fencing" showFeatureCount="0">
-        <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 showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="fencing" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="fence_groups" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="cone_only_groups" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="cone_only_groups_5655c566_c302_4743_a580_b3593f83c018" isInOverview="0" visible="0"/>
+        </filegroup>
+      </legendlayer>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="fence_and_cone_groups" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Routes">
-      <legendgroup checked="Qt::Checked" open="true" name="Markers">
-        <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="route_markers" showFeatureCount="0">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+    <legendgroup checked="Qt::Checked" name="Routes" open="true">
+      <legendgroup checked="Qt::Checked" name="Markers" open="true">
+        <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="route_markers" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" isInOverview="0" visible="1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="all_routes" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="all_routes" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="timelapse" showFeatureCount="0">
-      <filegroup open="false" hidden="false">
-        <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
+    <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="timelapse" open="false">
+      <filegroup hidden="false" open="false">
+        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
       </filegroup>
     </legendlayer>
-    <legendgroup checked="Qt::Checked" open="true" name="Feeding Stations">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="water_tables" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="water_tables20170921142016467"/>
+    <legendgroup checked="Qt::Checked" name="Feeding Stations" open="true">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="water_tables" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="poi_labels" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+    <legendgroup checked="Qt::Unchecked" name="Ask Me" open="false">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="poi_labels" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="directions_to_start" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="directions_to_start" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="mayor" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
+    <legendgroup checked="Qt::Unchecked" name="Residents Access" open="false">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="mayor" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="viplabels" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="viplabels" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="vipaccess" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="vipaccess" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="golfaccess" showFeatureCount="0">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="golfaccess" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access_roads" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access_roads" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="false" name="osm_roads" showFeatureCount="1">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <legendgroup checked="Qt::Checked" name="OSM data" open="true">
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" name="osm_roads" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="osm_places" showFeatureCount="1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <legendlayer showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" name="osm_places" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="true" name="Start and Finish pages">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="data-comments" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+    <legendgroup checked="Qt::Unchecked" name="Start and Finish pages" open="true">
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="data-comments" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="start_finish_area" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="start_finish_area" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="capetownelevation-1m" showFeatureCount="1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
+    <legendgroup checked="Qt::Unchecked" name="Elevation" open="false">
+      <legendlayer showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1" name="capetownelevation-1m" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Map">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <legendgroup checked="Qt::Checked" name="Map" open="true">
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="Outlines" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <legendlayer showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="Outlines" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="annotation" refreshOnNotifyMessage="">
+  <main-annotation-layer autoRefreshTime="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" type="annotation" legendPlaceholderImage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -559,7 +571,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" minScale="1e+08" maxScale="100000" refreshOnNotifyMessage="" styleCategories="AllStyleCategories">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08" maxScale="100000" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" type="raster" legendPlaceholderImage="">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -624,7 +636,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -635,9 +647,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
-        <noDataList useSrcNoData="0" bandNo="2"/>
-        <noDataList useSrcNoData="0" bandNo="3"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList bandNo="2" useSrcNoData="0"/>
+        <noDataList bandNo="3" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -649,58 +661,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" fetchMode="0" enabled="0">
+      <temporal fetchMode="0" mode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" enabled="0" band="1" zscale="1" zoffset="0">
+      <elevation zoffset="0" symbology="Line" enabled="0" zscale="1" band="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="152,125,183,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="152,125,183,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -731,36 +743,36 @@
               <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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="152,125,183,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="152,125,183,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="152,125,183,255" k="color"/>
@@ -775,9 +787,9 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -786,27 +798,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" value="copy" type="QString"/>
-          <Option name="QFieldSync/cloud_action" value="no_action" type="QString"/>
-          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
-          <Option name="WMSBackgroundLayer" value="false" type="QString"/>
-          <Option name="WMSPublishDataSourceUrl" value="false" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="identify/format" value="Value" type="QString"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="false" type="QString" name="WMSBackgroundLayer"/>
+          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="Value" type="QString" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option name="name" value="" type="QString"/>
+          <Option value="" type="QString" name="name"/>
           <Option name="properties"/>
-          <Option name="type" value="collection" type="QString"/>
+          <Option value="collection" type="QString" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
+          <resampling maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.5" nodataColor="" greenBand="2" blueBand="3" type="multibandcolor" redBand="1" alphaBand="-1">
+        <rasterrenderer opacity="0.5" greenBand="2" alphaBand="-1" nodataColor="" redBand="1" type="multibandcolor" blueBand="3">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -817,14 +829,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
-        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeRed="255" invertColors="0" colorizeGreen="128" colorizeBlue="128" grayscaleMode="0" saturation="0"/>
+        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
+        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeGreen="128" colorizeRed="255" grayscaleMode="0" saturation="0" invertColors="0" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" minScale="1e+08" maxScale="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08" maxScale="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" type="raster" legendPlaceholderImage="">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -889,7 +901,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -900,7 +912,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -912,58 +924,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" fetchMode="0" enabled="0">
+      <temporal fetchMode="0" mode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" enabled="0" band="1" zscale="1" zoffset="0">
+      <elevation zoffset="0" symbology="Line" enabled="0" zscale="1" band="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="225,89,137,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="225,89,137,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -994,36 +1006,36 @@
               <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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="225,89,137,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -1038,9 +1050,9 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1049,27 +1061,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" value="no_action" type="QString"/>
-          <Option name="QFieldSync/cloud_action" value="no_action" type="QString"/>
-          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
-          <Option name="WMSBackgroundLayer" value="true" type="QString"/>
-          <Option name="WMSPublishDataSourceUrl" value="false" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="identify/format" value="Undefined" type="QString"/>
+          <Option value="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="true" type="QString" name="WMSBackgroundLayer"/>
+          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="Undefined" type="QString" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option name="name" value="" type="QString"/>
+          <Option value="" type="QString" name="name"/>
           <Option name="properties"/>
-          <Option name="type" value="collection" type="QString"/>
+          <Option value="collection" type="QString" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
+          <resampling maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.75" nodataColor="" band="1" type="singlebandcolordata" alphaBand="-1">
+        <rasterrenderer opacity="0.75" alphaBand="-1" nodataColor="" type="singlebandcolordata" band="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1080,14 +1092,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
-        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeRed="255" invertColors="0" colorizeGreen="128" colorizeBlue="128" grayscaleMode="0" saturation="0"/>
+        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
+        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeGreen="128" colorizeRed="255" grayscaleMode="0" saturation="0" invertColors="0" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1152,7 +1164,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1166,8 +1178,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" name="length_km" length="-1" subType="0" expression="$length * 100" comment="" type="6" precision="0"/>
-        <field typeName="double precision" name="length_m" length="-1" subType="0" expression="$length * 100 * 1000" comment="" type="6" precision="0"/>
+        <field expression="$length * 100" precision="0" length="-1" typeName="double precision" subType="0" name="length_km" comment="" type="6"/>
+        <field expression="$length * 100 * 1000" precision="0" length="-1" typeName="double precision" subType="0" name="length_m" comment="" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1180,58 +1192,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="RouteLen" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="RouteLen">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="229,182,54,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="229,182,54,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1262,36 +1274,36 @@
               <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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="229,182,54,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="164,130,39,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="229,182,54,255" k="color"/>
@@ -1306,44 +1318,44 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="229,182,54,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="164,130,39,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -1366,59 +1378,59 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" checkstate="0" symbol="0" description="Only show when active in Atlas" label="Active Routes" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
-            <rule filter="&quot;Source&quot; = '21KM'" checkstate="0" symbol="1" description="This should be disabled, since it's only for legends" label="21KM" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
-            <rule filter="&quot;Source&quot; = '10KM'" checkstate="0" symbol="2" description="This should be disabled, since it's only for legends" label="10KM" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
-            <rule filter="&quot;Source&quot; = '5KM'" checkstate="0" symbol="3" description="This should be disabled, since it's only for legends" label="5KM" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
-            <rule filter="&quot;Source&quot; = 'Trail'" checkstate="0" symbol="4" description="This should be disabled, since it's only for legends" label="Trail" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
+          <rule description="Only show when active in Atlas" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" symbol="0" checkstate="0" label="Active Routes" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '21KM'" symbol="1" checkstate="0" label="21KM" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '10KM'" symbol="2" checkstate="0" label="10KM" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '5KM'" symbol="3" checkstate="0" label="5KM" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = 'Trail'" symbol="4" checkstate="0" label="Trail" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" symbol="5" description="Only show when active in Atlas" label="Show by day" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule filter="&quot;Source&quot; = '21KM'" checkstate="0" symbol="6" description="This should be disabled, since it's only for legends" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule filter="&quot;Source&quot; = '10KM'" checkstate="0" symbol="7" description="This should be disabled, since it's only for legends" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule filter="&quot;Source&quot; = '5KM'" checkstate="0" symbol="8" description="This should be disabled, since it's only for legends" label="5KM" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
-            <rule filter="&quot;Source&quot; = 'Trail'" checkstate="0" symbol="9" description="This should be disabled, since it's only for legends" label="Trail" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <rule description="Only show when active in Atlas" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" symbol="5" label="Show by day" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '21KM'" symbol="6" checkstate="0" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '10KM'" symbol="7" checkstate="0" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '5KM'" symbol="8" checkstate="0" label="5KM" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
+            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = 'Trail'" symbol="9" checkstate="0" label="Trail" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
           </rule>
-          <rule checkstate="0" symbol="10" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0" symbol="11" label="Always show by day" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule symbol="10" checkstate="0" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="11" checkstate="0" label="Always show by day" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1438,44 +1450,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@0@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
@@ -1491,32 +1503,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@0@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@0@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,0,0,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,0,0,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -1531,15 +1543,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1547,35 +1559,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1606,36 +1618,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1655,40 +1667,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@0@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@0@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -1711,38 +1723,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option 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" type="QString"/>
-                          <Option name="type" value="3" type="int"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                          <Option value="3" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1762,40 +1774,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@0@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@0@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -1818,47 +1830,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option 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" type="QString"/>
-                          <Option name="type" value="3" type="int"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                          <Option value="3" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1878,44 +1890,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -1931,32 +1943,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@1@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@1@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="210,32,39,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="210,32,39,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -1971,15 +1983,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1987,35 +1999,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="210,32,39,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="210,32,39,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2046,36 +2058,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2095,40 +2107,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2151,38 +2163,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2202,40 +2214,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2258,58 +2270,58 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="10" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="10" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2340,56 +2352,56 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="11" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="11" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.46" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.46" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2420,45 +2432,45 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="2" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2478,44 +2490,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@2@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@2@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -2531,32 +2543,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@2@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@2@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="103,34,144,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -2571,15 +2583,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2587,35 +2599,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="103,34,144,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2646,36 +2658,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2695,40 +2707,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@2@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@2@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2751,38 +2763,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2802,40 +2814,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@2@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@2@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2858,47 +2870,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="3" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2918,44 +2930,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@3@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@3@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="145,211,55,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
@@ -2971,32 +2983,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@3@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@3@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="145,211,55,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="145,211,55,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
@@ -3011,15 +3023,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3027,35 +3039,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="145,211,55,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,211,55,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3086,36 +3098,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3135,40 +3147,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@3@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@3@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="145,211,55,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3191,38 +3203,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3242,40 +3254,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@3@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@3@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="145,211,55,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3298,47 +3310,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="4" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3358,44 +3370,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@4@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@4@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="0,72,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="0,72,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,72,255,255" k="color"/>
@@ -3411,32 +3423,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@4@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@4@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,72,255,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,72,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,72,255,255" k="color"/>
@@ -3451,15 +3463,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3467,35 +3479,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="0,72,255,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,72,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3526,36 +3538,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3575,40 +3587,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@4@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@4@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,72,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,72,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3631,38 +3643,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3682,40 +3694,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@4@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@4@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,72,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,72,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3738,47 +3750,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="5" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="5" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3798,44 +3810,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@5@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@5@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
@@ -3851,32 +3863,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@5@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@5@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,0,0,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,0,0,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -3891,15 +3903,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3907,35 +3919,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3966,36 +3978,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4015,40 +4027,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@5@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@5@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4071,38 +4083,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option 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" type="QString"/>
-                          <Option name="type" value="3" type="int"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                          <Option value="3" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4122,40 +4134,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@5@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@5@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4178,47 +4190,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option 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" type="QString"/>
-                          <Option name="type" value="3" type="int"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                          <Option value="3" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="6" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="6" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4238,44 +4250,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@6@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@6@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -4291,32 +4303,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@6@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@6@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="210,32,39,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="210,32,39,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -4331,15 +4343,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4347,35 +4359,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="210,32,39,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="210,32,39,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -4406,36 +4418,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4455,40 +4467,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@6@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@6@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4511,38 +4523,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4562,40 +4574,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@6@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@6@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4618,47 +4630,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="7" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="7" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4678,44 +4690,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@7@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@7@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -4731,32 +4743,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@7@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@7@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="103,34,144,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -4771,15 +4783,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4787,35 +4799,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="103,34,144,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -4846,36 +4858,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4895,40 +4907,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@7@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@7@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4951,38 +4963,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5002,40 +5014,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@7@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@7@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5058,47 +5070,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="8" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="8" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5118,44 +5130,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@8@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@8@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="145,211,55,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
@@ -5171,32 +5183,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@8@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@8@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="145,211,55,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="145,211,55,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
@@ -5211,15 +5223,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5227,35 +5239,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="145,211,55,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,211,55,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -5286,36 +5298,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5335,40 +5347,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@8@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@8@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="145,211,55,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5391,38 +5403,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5442,40 +5454,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@8@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@8@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="145,211,55,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5498,47 +5510,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="9" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="9" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="250" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="RenderMetersInMapUnits" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5558,44 +5570,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@9@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@9@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="0,72,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" type="QString"/>
-                    <Option name="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="0,72,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,72,255,255" k="color"/>
@@ -5611,32 +5623,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@9@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@9@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,72,255,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="227,26,28,0" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,72,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,72,255,255" k="color"/>
@@ -5651,15 +5663,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5667,35 +5679,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="MapUnit" 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="0,72,255,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.5" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,72,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -5726,36 +5738,36 @@
               <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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5775,40 +5787,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@9@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@9@2" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,72,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,72,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5831,38 +5843,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="FirstVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5882,40 +5894,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@9@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@9@3" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,72,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,72,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5938,15 +5950,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -5960,42 +5972,42 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{48fee05e-0ef3-420c-825c-567446ab3f47}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" description="Active routes" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}">
+          <rule description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}">
             <settings calloutType="simple">
-              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="round($length / 1000, 0)" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="round($length / 1000, 0)" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="164,113,88,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="164,113,88,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -6018,34 +6030,34 @@
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,0,0,255" type="QString"/>
-                        <Option name="joinstyle" value="round" 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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="1" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,0,0,255" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -6060,98 +6072,98 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                            <Option type="Map" name="outlineColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="10" geometryGeneratorEnabled="1" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="km_marker()" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="0" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="3" offsetUnits="MapUnit" placementFlags="10" layerType="LineGeometry" geometryGenerator="km_marker()" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <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="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="field" value="quadrant" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="quadrant" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="field" value="rotation" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="rotation" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -6160,10 +6172,10 @@
       </labeling>
       <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="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
@@ -6172,56 +6184,56 @@
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -6252,9 +6264,9 @@
                 <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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6262,12 +6274,12 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -6278,199 +6290,199 @@
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="None">
+        <field configurationFlags="None" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="None">
+        <field configurationFlags="None" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="None">
+        <field configurationFlags="None" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Sort" configurationFlags="None">
+        <field configurationFlags="None" name="Sort">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="length_km" configurationFlags="None">
+        <field configurationFlags="None" name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="descriptio"/>
+        <alias index="2" name="" field="timestamp"/>
+        <alias index="3" name="" field="begin"/>
+        <alias index="4" name="" field="end"/>
+        <alias index="5" name="" field="Distance"/>
+        <alias index="6" name="" field="RouteLen"/>
+        <alias index="7" name="" field="Source"/>
+        <alias index="8" name="" field="Sort"/>
+        <alias index="9" name="" field="day"/>
+        <alias index="10" name="" field="length_km"/>
+        <alias index="11" name="" field="length_m"/>
       </aliases>
       <defaults>
-        <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="Distance" applyOnUpdate="0" expression=""/>
-        <default field="RouteLen" applyOnUpdate="0" expression=""/>
-        <default field="Source" applyOnUpdate="0" expression=""/>
-        <default field="Sort" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="length_km" applyOnUpdate="0" expression=""/>
-        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="descriptio"/>
+        <default expression="" applyOnUpdate="0" field="timestamp"/>
+        <default expression="" applyOnUpdate="0" field="begin"/>
+        <default expression="" applyOnUpdate="0" field="end"/>
+        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default expression="" applyOnUpdate="0" field="RouteLen"/>
+        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default expression="" applyOnUpdate="0" field="Sort"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="length_km"/>
+        <default expression="" applyOnUpdate="0" field="length_m"/>
       </defaults>
       <constraints>
-        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="descriptio" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="timestamp" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="begin" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="end" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="RouteLen" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Source" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Sort" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="length_km" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="length_m" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descriptio"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="timestamp"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="begin"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="end"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Distance"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Source"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Sort"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length_km"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length_m"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="Sort" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
+        <constraint desc="" exp="" field="Name"/>
+        <constraint desc="" exp="" field="descriptio"/>
+        <constraint desc="" exp="" field="timestamp"/>
+        <constraint desc="" exp="" field="begin"/>
+        <constraint desc="" exp="" field="end"/>
+        <constraint desc="" exp="" field="Distance"/>
+        <constraint desc="" exp="" field="RouteLen"/>
+        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" exp="" field="Sort"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="length_km"/>
+        <constraint desc="" exp="" field="length_m"/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" name="length_km" length="-1" subType="0" expression="$length * 100" comment="" type="6" precision="0"/>
-        <field typeName="double precision" name="length_m" length="-1" subType="0" expression="$length * 100 * 1000" comment="" type="6" precision="0"/>
+        <field expression="$length * 100" precision="0" length="-1" typeName="double precision" subType="0" name="length_km" comment="" type="6"/>
+        <field expression="$length * 100 * 1000" precision="0" length="-1" typeName="double precision" subType="0" name="length_m" comment="" type="6"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;length_m&quot;" actionWidgetStyle="dropDown" sortOrder="1">
+      <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;length_m&quot;">
         <columns>
-          <column width="152" hidden="0" name="Name" type="field"/>
-          <column width="-1" hidden="0" name="descriptio" type="field"/>
-          <column width="-1" hidden="0" name="timestamp" type="field"/>
-          <column width="163" hidden="0" name="begin" type="field"/>
-          <column width="-1" hidden="0" name="end" type="field"/>
-          <column width="-1" hidden="0" name="Distance" type="field"/>
+          <column width="152" hidden="0" type="field" name="Name"/>
+          <column width="-1" hidden="0" type="field" name="descriptio"/>
+          <column width="-1" hidden="0" type="field" name="timestamp"/>
+          <column width="163" hidden="0" type="field" name="begin"/>
+          <column width="-1" hidden="0" type="field" name="end"/>
+          <column width="-1" hidden="0" type="field" name="Distance"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="RouteLen" type="field"/>
-          <column width="-1" hidden="0" name="Source" type="field"/>
-          <column width="188" hidden="0" name="length_m" type="field"/>
-          <column width="-1" hidden="0" name="Sort" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="266" hidden="0" name="length_km" type="field"/>
+          <column width="-1" hidden="0" type="field" name="RouteLen"/>
+          <column width="-1" hidden="0" type="field" name="Source"/>
+          <column width="188" hidden="0" type="field" name="length_m"/>
+          <column width="-1" hidden="0" type="field" name="Sort"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="266" hidden="0" type="field" name="length_km"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6516,39 +6528,39 @@ def my_form_open(dialog, layer, feature):
         <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="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></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6621,58 +6633,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="196,60,57,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="196,60,57,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -6703,36 +6715,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="196,60,57,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="140,43,41,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="196,60,57,255" k="color"/>
@@ -6747,44 +6759,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="196,60,57,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="140,43,41,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -6807,54 +6819,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="183,72,75,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="183,72,75,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -6885,9 +6897,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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6898,9 +6910,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -6913,21 +6925,21 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="ID" configurationFlags="None">
+        <field configurationFlags="None" name="ID">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="height" configurationFlags="None">
+        <field configurationFlags="None" name="height">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="elevation" configurationFlags="None">
+        <field configurationFlags="None" name="elevation">
           <editWidget type="">
             <config>
               <Option/>
@@ -6936,30 +6948,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias index="0" name="" field="ID"/>
+        <alias index="1" name="" field="height"/>
+        <alias index="2" name="" field="elevation"/>
       </aliases>
       <defaults>
-        <default field="ID" applyOnUpdate="0" expression=""/>
-        <default field="height" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="ID"/>
+        <default expression="" applyOnUpdate="0" field="height"/>
+        <default expression="" applyOnUpdate="0" field="elevation"/>
       </defaults>
       <constraints>
-        <constraint field="ID" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="height" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="elevation" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="ID"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="height"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="elevation"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" desc="" exp=""/>
-        <constraint field="height" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
+        <constraint desc="" exp="" field="ID"/>
+        <constraint desc="" exp="" field="height"/>
+        <constraint desc="" exp="" field="elevation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6982,7 +6994,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="Polygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -7057,58 +7069,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="133,182,111,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="133,182,111,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7139,36 +7151,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="133,182,111,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="95,130,79,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="133,182,111,255" k="color"/>
@@ -7183,44 +7195,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="133,182,111,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="95,130,79,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -7243,38 +7255,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="225,89,137,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -7289,9 +7301,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7302,9 +7314,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" value="no_action" type="QString"/>
-          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
-          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option value="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -7319,28 +7331,28 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="page" configurationFlags="None">
+        <field configurationFlags="None" name="page">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
@@ -7349,34 +7361,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="page"/>
+        <alias index="3" name="" field="day"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="page" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="page"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="page" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="page"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="page" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="page"/>
+        <constraint desc="" exp="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7399,7 +7411,574 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="Polygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
+      <extent>
+        <xmin>18.37673321782479974</xmin>
+        <ymin>-33.94582464707783487</ymin>
+        <xmax>18.42000208179202403</xmax>
+        <ymax>-33.89964429152626479</ymax>
+      </extent>
+      <wgs84extent>
+        <xmin>18.37673321782479974</xmin>
+        <ymin>-33.94582464707783487</ymin>
+        <xmax>18.42000208179202403</xmax>
+        <ymax>-33.89964429152626479</ymax>
+      </wgs84extent>
+      <id>cone_only_groups_5655c566_c302_4743_a580_b3593f83c018</id>
+      <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'fenc%25'%20GROUP%20BY%20%22group%22</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>cone_only_groups</layername>
+      <srs>
+        <spatialrefsys nativeFormat="Wkt">
+          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+          <srsid>3452</srsid>
+          <srid>4326</srid>
+          <authid>EPSG:4326</authid>
+          <description>WGS 84</description>
+          <projectionacronym>longlat</projectionacronym>
+          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type></type>
+        <title></title>
+        <abstract></abstract>
+        <links/>
+        <fees></fees>
+        <encoding></encoding>
+        <crs>
+          <spatialrefsys nativeFormat="Wkt">
+            <wkt></wkt>
+            <proj4></proj4>
+            <srsid>0</srsid>
+            <srid>0</srid>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
+            <geographicflag>false</geographicflag>
+          </spatialrefsys>
+        </crs>
+        <extent/>
+      </resourceMetadata>
+      <provider encoding="">virtual</provider>
+      <vectorjoins/>
+      <layerDependencies>
+        <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      </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 startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
+        <data-defined-properties>
+          <Option type="Map">
+            <Option value="" type="QString" name="name"/>
+            <Option name="properties"/>
+            <Option value="collection" type="QString" name="type"/>
+          </Option>
+        </data-defined-properties>
+        <profileLineSymbol>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="243,166,178,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+              </Option>
+              <prop v="0" k="align_dash_pattern"/>
+              <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"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="dash_pattern_offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+              <prop v="MM" k="dash_pattern_offset_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="243,166,178,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.6" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="trim_distance_end"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_end_unit"/>
+              <prop v="0" k="trim_distance_start"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_start_unit"/>
+              <prop v="0" k="tweak_dash_pattern_on_corners"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileLineSymbol>
+        <profileFillSymbol>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="243,166,178,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="174,119,127,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
+              </Option>
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="243,166,178,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="174,119,127,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileFillSymbol>
+        <profileMarkerSymbol>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="243,166,178,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="174,119,127,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
+              </Option>
+              <prop v="0" k="angle"/>
+              <prop v="square" k="cap_style"/>
+              <prop v="243,166,178,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="diamond" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="174,119,127,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="3" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MM" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileMarkerSymbol>
+      </elevation>
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+        <symbols>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="0" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="38,162,105,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="f_diagonal" type="QString" name="style"/>
+              </Option>
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="114,155,111,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="38,162,105,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="f_diagonal" k="style"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </symbols>
+        <rotation/>
+        <sizescale/>
+      </renderer-v2>
+      <customproperties>
+        <Option type="Map">
+          <Option type="List" name="dualview/previewExpressions">
+            <Option value="&quot;name&quot;" type="QString"/>
+          </Option>
+          <Option value="0" type="int" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
+        </Option>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="1" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="5" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="0" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" bold="0" underline="0" style="0" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
+          <axisSymbol>
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                </Option>
+                <prop v="0" k="align_dash_pattern"/>
+                <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"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="dash_pattern_offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+                <prop v="MM" k="dash_pattern_offset_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="35,35,35,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0.26" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="trim_distance_end"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_end_unit"/>
+                <prop v="0" k="trim_distance_start"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_start_unit"/>
+                <prop v="0" k="tweak_dash_pattern_on_corners"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </axisSymbol>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="1" linePlacementFlags="18" showAll="1" priority="0">
+        <properties>
+          <Option type="Map">
+            <Option value="" type="QString" name="name"/>
+            <Option name="properties"/>
+            <Option value="collection" type="QString" name="type"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+        <activeChecks/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option value="0" type="double" name="allowedGapsBuffer"/>
+            <Option value="false" type="bool" name="allowedGapsEnabled"/>
+            <Option value="" type="QString" name="allowedGapsLayer"/>
+          </Option>
+        </checkConfiguration>
+      </geometryOptions>
+      <legend showLabelLegend="0" type="default-vector"/>
+      <referencedLayers/>
+      <fieldConfiguration>
+        <field configurationFlags="None" name="name">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="group">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="type">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="day">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="cone_len">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias index="0" name="" field="name"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="day"/>
+        <alias index="4" name="" field="cone_len"/>
+      </aliases>
+      <defaults>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="cone_len"/>
+      </defaults>
+      <constraints>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="group"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cone_len"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="cone_len"/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+      </attributeactions>
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+        <columns>
+          <column width="306" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="group"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="-1" hidden="0" type="field" name="cone_len"/>
+          <column width="-1" hidden="1" type="actions"/>
+        </columns>
+      </attributetableconfig>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <storedexpressions/>
+      <editform tolerant="1"></editform>
+      <editforminit/>
+      <editforminitcodesource>0</editforminitcodesource>
+      <editforminitfilepath></editforminitfilepath>
+      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+"""
+QGIS forms can have a Python function that is called when the form is
+opened.
+
+Use this function to add extra logic to your forms.
+
+Enter the name of the function in the "Python Init function"
+field.
+An example follows:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+    geom = feature.geometry()
+    control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
+      <featformsuppress>0</featformsuppress>
+      <editorlayout>generatedlayout</editorlayout>
+      <editable>
+        <field editable="1" name="cone_len"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
+      </editable>
+      <labelOnTop>
+        <field 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 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></mapTip>
+    </maplayer>
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -7464,7 +8043,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7489,58 +8068,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="190,178,151,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="190,178,151,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7571,36 +8150,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="190,178,151,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="136,127,108,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,178,151,255" k="color"/>
@@ -7615,44 +8194,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="190,178,151,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="136,127,108,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -7675,54 +8254,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="0,85,255,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="1" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,85,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7753,9 +8332,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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7766,32 +8345,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="Name" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="63" fieldName="Name" textOpacity="1" isExpression="0" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -7806,116 +8385,116 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-          <placement priority="5" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="LineGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+          <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="0" xOffset="0" offsetType="0" placement="2" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="PreventOverlap" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="LineGeometry"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-              <Option name="blendMode" value="0" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" value="" type="QString"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" value="false" type="bool"/>
-              <Option name="enabled" value="0" type="QString"/>
-              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-              <Option name="minLength" value="0" type="double"/>
-              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="minLengthUnit" value="MM" type="QString"/>
-              <Option name="offsetFromAnchor" value="0" type="double"/>
-              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-              <Option name="offsetFromLabel" value="0" type="double"/>
-              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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" value="Name" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="Name" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -7946,9 +8525,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7956,12 +8535,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -7972,14 +8551,14 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -7988,29 +8567,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="Name"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Name"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="Name" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="Name"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="Name"/>
           <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
@@ -8047,8 +8626,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="id"/>
       </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/>
@@ -8056,7 +8635,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8121,7 +8700,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8146,58 +8725,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="145,82,45,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,82,45,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -8228,36 +8807,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="145,82,45,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="104,59,32,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="145,82,45,255" k="color"/>
@@ -8272,44 +8851,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="145,82,45,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="104,59,32,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -8332,48 +8911,48 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule filter="&quot;distance&quot; = '21KM'" symbol="0" description="Only show when active in Atlas" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule filter="&quot;distance&quot; = '10KM'" symbol="1" description="Only show when active in Atlas" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule filter="&quot;distance&quot; = '5KM'" symbol="2" description="Only show when active in Atlas" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '21KM'" symbol="0" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '10KM'" symbol="1" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '5KM'" symbol="2" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8393,40 +8972,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@0@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="miter" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="210,32,39,255" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0.5" 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="area" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="miter" type="QString" name="joinstyle"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="210,32,39,255" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0.5" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="area" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -8449,32 +9028,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="250" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MapUnit" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="100" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="100" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8494,44 +9073,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@0@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@0@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="210,32,39,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" 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 value="0" type="QString" name="angle"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -8547,32 +9126,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@0@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@0@1@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="210,32,39,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="26,0,201,0" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="210,32,39,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -8587,9 +9166,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8597,35 +9176,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="flat" 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="MapUnit" 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="miter" type="QString"/>
-                <Option name="line_color" value="210,32,39,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.75" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="210,32,39,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -8656,39 +9235,39 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8708,44 +9287,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="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 value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -8761,32 +9340,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@1@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@1@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="103,34,144,255" type="QString"/>
-                        <Option name="joinstyle" value="miter" 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="103,34,144,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.5" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="103,34,144,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.5" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -8801,9 +9380,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8811,24 +9390,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="250" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="100" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="100" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8848,44 +9427,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="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 value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -8901,32 +9480,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@1@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@1@1@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="103,34,144,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="26,0,201,0" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -8941,9 +9520,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8951,35 +9530,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="flat" 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="miter" type="QString"/>
-                <Option name="line_color" value="103,34,144,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.75" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -9010,39 +9589,39 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="2" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="500" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MapUnit" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9062,44 +9641,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@2@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@2@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="69,100,25,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" 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 value="0" type="QString" name="angle"/>
+                    <Option value="69,100,25,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
@@ -9115,32 +9694,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@2@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@2@0@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="69,100,25,255" type="QString"/>
-                        <Option name="joinstyle" value="miter" 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="69,100,25,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.5" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="69,100,25,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="69,100,25,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.5" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
@@ -9155,9 +9734,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9165,24 +9744,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="250" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MapUnit" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="100" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MapUnit" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MapUnit" type="QString"/>
-                <Option name="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="100" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9202,44 +9781,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@2@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@2@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="69,100,25,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="MapUnit" 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 value="0" type="QString" name="angle"/>
+                    <Option value="69,100,25,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
@@ -9255,32 +9834,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@2@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@2@1@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="69,100,25,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="26,0,201,0" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="69,100,25,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
@@ -9295,9 +9874,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9305,35 +9884,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="flat" 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="MapUnit" 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="miter" type="QString"/>
-                <Option name="line_color" value="69,100,25,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.75" 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="MapUnit" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="69,100,25,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -9364,9 +9943,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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9378,60 +9957,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -9462,9 +10041,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9472,12 +10051,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -9488,49 +10067,49 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="Distance"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="Distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="Distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column width="-1" hidden="0" name="Distance" type="field"/>
+          <column width="-1" hidden="0" type="field" name="Distance"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9575,17 +10154,17 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="timestamp"/>
       </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/>
@@ -9593,7 +10172,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -9666,58 +10245,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="125,139,143,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="125,139,143,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -9748,36 +10327,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="125,139,143,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="89,99,102,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="125,139,143,255" k="color"/>
@@ -9792,44 +10371,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="125,139,143,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="89,99,102,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -9852,46 +10431,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="0.796078" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="0.796078" type="marker" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="227,0,185,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="name" value="circle" 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="0,0,0,0" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0" 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="1" 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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="227,0,185,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="1" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -9914,15 +10493,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9933,34 +10512,34 @@ 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" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="position" textOpacity="1" isExpression="0" namedStyle="Semibold" fontSize="8" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeY="0.20000000000000001">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.4" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -9975,151 +10554,151 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="FontStyle">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="ObstacleFactor">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="Priority" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="Priority">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="Size">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="ZIndex" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="ZIndex">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="8" geometryGeneratorEnabled="0" placement="1" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="8" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="1" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="Priority">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="Size">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="4" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="227,0,185,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="position" textOpacity="0.90000000000000002" isExpression="0" namedStyle="Semibold" fontSize="4" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="227,0,185,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.5" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.1" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -10134,89 +10713,89 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="FontStyle">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="Size">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="2" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="1" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="0" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="2" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="Size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -10225,194 +10804,194 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
-          <Option name="labeling/angleOffset" value="0" type="QString"/>
-          <Option name="labeling/blendMode" value="0" type="QString"/>
-          <Option name="labeling/bufferBlendMode" value="0" type="QString"/>
-          <Option name="labeling/bufferColorA" value="255" type="QString"/>
-          <Option name="labeling/bufferColorB" value="255" type="QString"/>
-          <Option name="labeling/bufferColorG" value="255" type="QString"/>
-          <Option name="labeling/bufferColorR" value="255" type="QString"/>
-          <Option name="labeling/bufferDraw" value="false" type="QString"/>
-          <Option name="labeling/bufferJoinStyle" value="64" type="QString"/>
-          <Option name="labeling/bufferNoFill" value="false" type="QString"/>
-          <Option name="labeling/bufferSize" value="1" type="QString"/>
-          <Option name="labeling/bufferSizeInMapUnits" value="false" type="QString"/>
-          <Option name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/bufferTransp" value="0" type="QString"/>
-          <Option name="labeling/centroidInside" value="false" type="QString"/>
-          <Option name="labeling/centroidWhole" value="false" type="QString"/>
-          <Option name="labeling/decimals" value="3" type="QString"/>
-          <Option name="labeling/displayAll" value="false" type="QString"/>
-          <Option name="labeling/dist" value="0" type="QString"/>
-          <Option name="labeling/distInMapUnits" value="false" type="QString"/>
-          <Option name="labeling/distMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/drawLabels" value="false" type="QString"/>
-          <Option name="labeling/enabled" value="false" type="QString"/>
-          <Option name="labeling/fieldName" value="position" type="QString"/>
-          <Option name="labeling/fitInPolygonOnly" value="false" type="QString"/>
-          <Option name="labeling/fontCapitals" value="0" type="QString"/>
-          <Option name="labeling/fontFamily" value="Myriad Pro" type="QString"/>
-          <Option name="labeling/fontItalic" value="false" type="QString"/>
-          <Option name="labeling/fontLetterSpacing" value="0" type="QString"/>
-          <Option name="labeling/fontLimitPixelSize" value="false" type="QString"/>
-          <Option name="labeling/fontMaxPixelSize" value="10000" type="QString"/>
-          <Option name="labeling/fontMinPixelSize" value="3" type="QString"/>
-          <Option name="labeling/fontSize" value="10" type="QString"/>
-          <Option name="labeling/fontSizeInMapUnits" value="false" type="QString"/>
-          <Option name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/fontStrikeout" value="false" type="QString"/>
-          <Option name="labeling/fontUnderline" value="false" type="QString"/>
-          <Option name="labeling/fontWeight" value="63" type="QString"/>
-          <Option name="labeling/fontWordSpacing" value="0" type="QString"/>
-          <Option name="labeling/formatNumbers" value="false" type="QString"/>
-          <Option name="labeling/isExpression" value="false" type="QString"/>
-          <Option name="labeling/labelOffsetInMapUnits" value="true" type="QString"/>
-          <Option name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/labelPerPart" value="false" type="QString"/>
-          <Option name="labeling/leftDirectionSymbol" value="&lt;" type="QString"/>
-          <Option name="labeling/limitNumLabels" value="false" type="QString"/>
-          <Option name="labeling/maxCurvedCharAngleIn" value="20" type="QString"/>
-          <Option name="labeling/maxCurvedCharAngleOut" value="-20" type="QString"/>
-          <Option name="labeling/maxNumLabels" value="2000" type="QString"/>
-          <Option name="labeling/mergeLines" value="false" type="QString"/>
-          <Option name="labeling/minFeatureSize" value="0" type="QString"/>
-          <Option name="labeling/multilineAlign" value="0" type="QString"/>
-          <Option name="labeling/multilineHeight" value="1" type="QString"/>
-          <Option name="labeling/namedStyle" value="Semibold" type="QString"/>
-          <Option name="labeling/obstacle" value="true" type="QString"/>
-          <Option name="labeling/obstacleFactor" value="1" type="QString"/>
-          <Option name="labeling/obstacleType" value="0" type="QString"/>
-          <Option name="labeling/offsetType" value="0" type="QString"/>
-          <Option name="labeling/placeDirectionSymbol" value="0" type="QString"/>
-          <Option name="labeling/placement" value="0" type="QString"/>
-          <Option name="labeling/placementFlags" value="10" type="QString"/>
-          <Option name="labeling/plussign" value="false" type="QString"/>
-          <Option name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString"/>
-          <Option name="labeling/preserveRotation" value="true" type="QString"/>
-          <Option name="labeling/previewBkgrdColor" value="#ffffff" type="QString"/>
-          <Option name="labeling/priority" value="5" type="QString"/>
-          <Option name="labeling/quadOffset" value="4" type="QString"/>
-          <Option name="labeling/repeatDistance" value="0" type="QString"/>
-          <Option name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/repeatDistanceUnit" value="1" type="QString"/>
-          <Option name="labeling/reverseDirectionSymbol" value="false" type="QString"/>
-          <Option name="labeling/rightDirectionSymbol" value=">" type="QString"/>
-          <Option name="labeling/scaleMax" value="10000000" type="QString"/>
-          <Option name="labeling/scaleMin" value="1" type="QString"/>
-          <Option name="labeling/scaleVisibility" value="false" type="QString"/>
-          <Option name="labeling/shadowBlendMode" value="6" type="QString"/>
-          <Option name="labeling/shadowColorB" value="0" type="QString"/>
-          <Option name="labeling/shadowColorG" value="0" type="QString"/>
-          <Option name="labeling/shadowColorR" value="0" type="QString"/>
-          <Option name="labeling/shadowDraw" value="false" type="QString"/>
-          <Option name="labeling/shadowOffsetAngle" value="135" type="QString"/>
-          <Option name="labeling/shadowOffsetDist" value="1" type="QString"/>
-          <Option name="labeling/shadowOffsetGlobal" value="true" type="QString"/>
-          <Option name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shadowOffsetUnits" value="1" type="QString"/>
-          <Option name="labeling/shadowRadius" value="1.5" type="QString"/>
-          <Option name="labeling/shadowRadiusAlphaOnly" value="false" type="QString"/>
-          <Option name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shadowRadiusUnits" value="1" type="QString"/>
-          <Option name="labeling/shadowScale" value="100" type="QString"/>
-          <Option name="labeling/shadowTransparency" value="30" type="QString"/>
-          <Option name="labeling/shadowUnder" value="0" type="QString"/>
-          <Option name="labeling/shapeBlendMode" value="0" type="QString"/>
-          <Option name="labeling/shapeBorderColorA" value="255" type="QString"/>
-          <Option name="labeling/shapeBorderColorB" value="128" type="QString"/>
-          <Option name="labeling/shapeBorderColorG" value="128" type="QString"/>
-          <Option name="labeling/shapeBorderColorR" value="128" type="QString"/>
-          <Option name="labeling/shapeBorderWidth" value="0" type="QString"/>
-          <Option name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeBorderWidthUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeDraw" value="true" type="QString"/>
-          <Option name="labeling/shapeFillColorA" value="255" type="QString"/>
-          <Option name="labeling/shapeFillColorB" value="138" type="QString"/>
-          <Option name="labeling/shapeFillColorG" value="0" type="QString"/>
-          <Option name="labeling/shapeFillColorR" value="101" type="QString"/>
-          <Option name="labeling/shapeJoinStyle" value="64" type="QString"/>
-          <Option name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeOffsetUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeOffsetX" value="0" type="QString"/>
-          <Option name="labeling/shapeOffsetY" value="0" type="QString"/>
-          <Option name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeRadiiUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeRadiiX" value="0" type="QString"/>
-          <Option name="labeling/shapeRadiiY" value="0" type="QString"/>
-          <Option name="labeling/shapeRotation" value="0" type="QString"/>
-          <Option name="labeling/shapeRotationType" value="0" type="QString"/>
-          <Option name="labeling/shapeSVGFile" value="" type="QString"/>
-          <Option name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeSizeType" value="0" type="QString"/>
-          <Option name="labeling/shapeSizeUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeSizeX" value="0" type="QString"/>
-          <Option name="labeling/shapeSizeY" value="0" type="QString"/>
-          <Option name="labeling/shapeTransparency" value="0" type="QString"/>
-          <Option name="labeling/shapeType" value="0" type="QString"/>
-          <Option name="labeling/textColorA" value="255" type="QString"/>
-          <Option name="labeling/textColorB" value="255" type="QString"/>
-          <Option name="labeling/textColorG" value="255" type="QString"/>
-          <Option name="labeling/textColorR" value="255" type="QString"/>
-          <Option name="labeling/textTransp" value="0" type="QString"/>
-          <Option name="labeling/upsidedownLabels" value="0" type="QString"/>
-          <Option name="labeling/wrapChar" value="" type="QString"/>
-          <Option name="labeling/xOffset" value="0" type="QString"/>
-          <Option name="labeling/yOffset" value="0" type="QString"/>
-          <Option name="labeling/zIndex" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/angleOffset"/>
+          <Option value="0" type="QString" name="labeling/blendMode"/>
+          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
+          <Option value="255" type="QString" name="labeling/bufferColorA"/>
+          <Option value="255" type="QString" name="labeling/bufferColorB"/>
+          <Option value="255" type="QString" name="labeling/bufferColorG"/>
+          <Option value="255" type="QString" name="labeling/bufferColorR"/>
+          <Option value="false" type="QString" name="labeling/bufferDraw"/>
+          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
+          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
+          <Option value="1" type="QString" name="labeling/bufferSize"/>
+          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/bufferTransp"/>
+          <Option value="false" type="QString" name="labeling/centroidInside"/>
+          <Option value="false" type="QString" name="labeling/centroidWhole"/>
+          <Option value="3" type="QString" name="labeling/decimals"/>
+          <Option value="false" type="QString" name="labeling/displayAll"/>
+          <Option value="0" type="QString" name="labeling/dist"/>
+          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/drawLabels"/>
+          <Option value="false" type="QString" name="labeling/enabled"/>
+          <Option value="position" type="QString" name="labeling/fieldName"/>
+          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
+          <Option value="0" type="QString" name="labeling/fontCapitals"/>
+          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
+          <Option value="false" type="QString" name="labeling/fontItalic"/>
+          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
+          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
+          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
+          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
+          <Option value="10" type="QString" name="labeling/fontSize"/>
+          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
+          <Option value="false" type="QString" name="labeling/fontUnderline"/>
+          <Option value="63" type="QString" name="labeling/fontWeight"/>
+          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
+          <Option value="false" type="QString" name="labeling/formatNumbers"/>
+          <Option value="false" type="QString" name="labeling/isExpression"/>
+          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/labelPerPart"/>
+          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
+          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
+          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
+          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
+          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
+          <Option value="false" type="QString" name="labeling/mergeLines"/>
+          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
+          <Option value="0" type="QString" name="labeling/multilineAlign"/>
+          <Option value="1" type="QString" name="labeling/multilineHeight"/>
+          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
+          <Option value="true" type="QString" name="labeling/obstacle"/>
+          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
+          <Option value="0" type="QString" name="labeling/obstacleType"/>
+          <Option value="0" type="QString" name="labeling/offsetType"/>
+          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/placement"/>
+          <Option value="10" type="QString" name="labeling/placementFlags"/>
+          <Option value="false" type="QString" name="labeling/plussign"/>
+          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
+          <Option value="true" type="QString" name="labeling/preserveRotation"/>
+          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
+          <Option value="5" type="QString" name="labeling/priority"/>
+          <Option value="4" type="QString" name="labeling/quadOffset"/>
+          <Option value="0" type="QString" name="labeling/repeatDistance"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
+          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
+          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
+          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
+          <Option value="1" type="QString" name="labeling/scaleMin"/>
+          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
+          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
+          <Option value="0" type="QString" name="labeling/shadowColorB"/>
+          <Option value="0" type="QString" name="labeling/shadowColorG"/>
+          <Option value="0" type="QString" name="labeling/shadowColorR"/>
+          <Option value="false" type="QString" name="labeling/shadowDraw"/>
+          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
+          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
+          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
+          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
+          <Option value="100" type="QString" name="labeling/shadowScale"/>
+          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
+          <Option value="0" type="QString" name="labeling/shadowUnder"/>
+          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
+          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
+          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
+          <Option value="true" type="QString" name="labeling/shapeDraw"/>
+          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
+          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
+          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
+          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
+          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
+          <Option value="0" type="QString" name="labeling/shapeRotation"/>
+          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
+          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
+          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
+          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
+          <Option value="0" type="QString" name="labeling/shapeType"/>
+          <Option value="255" type="QString" name="labeling/textColorA"/>
+          <Option value="255" type="QString" name="labeling/textColorB"/>
+          <Option value="255" type="QString" name="labeling/textColorG"/>
+          <Option value="255" type="QString" name="labeling/textColorR"/>
+          <Option value="0" type="QString" name="labeling/textTransp"/>
+          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
+          <Option value="" type="QString" name="labeling/wrapChar"/>
+          <Option value="0" type="QString" name="labeling/xOffset"/>
+          <Option value="0" type="QString" name="labeling/yOffset"/>
+          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -10443,9 +11022,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10453,12 +11032,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="10" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="10" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10469,67 +11048,67 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="position"/>
+        <alias index="2" name="" field="type"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="position" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="position"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="position"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="position"/>
+        <constraint desc="" exp="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="position" type="field"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" type="field" name="position"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10605,7 +11184,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="Polygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -10623,7 +11202,7 @@ def my_form_open(dialog, layer, feature):
       <keywordList>
         <value></value>
       </keywordList>
-      <layername>fence_groups</layername>
+      <layername>fence_and_cone_groups</layername>
       <srs>
         <spatialrefsys nativeFormat="Wkt">
           <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -10644,6 +11223,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -10660,14 +11248,24 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="">virtual</provider>
       <vectorjoins/>
       <layerDependencies>
         <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       </layerDependencies>
-      <dataDependencies/>
+      <dataDependencies>
+        <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      </dataDependencies>
       <expressionfields/>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -10680,58 +11278,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="164,113,88,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="164,113,88,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -10762,36 +11360,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="164,113,88,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="117,81,63,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="164,113,88,255" k="color"/>
@@ -10806,44 +11404,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="164,113,88,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="117,81,63,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -10866,38 +11464,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="0,85,0,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="0,85,0,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="b_diagonal" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,85,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,85,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="b_diagonal" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,85,0,255" k="color"/>
@@ -10912,9 +11510,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10925,62 +11523,62 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" value="no_action" 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="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option name="variableNames"/>
+          <Option name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -11011,9 +11609,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11021,64 +11619,64 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="1" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="1" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" value="0" type="double"/>
-            <Option name="allowedGapsEnabled" value="false" type="bool"/>
-            <Option name="allowedGapsLayer" value="" type="QString"/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option value="0" type="double" name="allowedGapsBuffer"/>
+            <Option value="false" type="bool" name="allowedGapsEnabled"/>
+            <Option value="" type="QString" name="allowedGapsLayer"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="group" configurationFlags="None">
+        <field configurationFlags="None" name="group">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
-          <editWidget type="">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="cone_len" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="fence_len" configurationFlags="None">
+        <field configurationFlags="None" name="cone_len">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="fence_len">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -11087,50 +11685,50 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
-        <alias field="fence_len" index="5" name=""/>
+        <alias index="0" name="" field="name"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="day"/>
+        <alias index="4" name="" field="cone_len"/>
+        <alias index="5" name="" field="fence_len"/>
       </aliases>
       <defaults>
-        <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=""/>
-        <default field="fence_len" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="cone_len"/>
+        <default expression="" applyOnUpdate="0" field="fence_len"/>
       </defaults>
       <constraints>
-        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="group" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="cone_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="fence_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="group"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cone_len"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fence_len"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="group" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
-        <constraint field="fence_len" desc="" exp=""/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="cone_len"/>
+        <constraint desc="" exp="" field="fence_len"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="415" hidden="0" name="name" type="field"/>
-          <column width="-1" hidden="0" name="group" type="field"/>
+          <column width="415" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="group"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
-          <column width="-1" hidden="0" name="cone_len" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="-1" hidden="0" name="fence_len" type="field"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
+          <column width="-1" hidden="0" type="field" name="cone_len"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="-1" hidden="0" type="field" name="fence_len"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11163,31 +11761,34 @@ def my_form_open(dialog, layer, feature):
       <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"/>
       </editable>
       <labelOnTop>
-        <field name="cone_len" 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="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></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11252,7 +11853,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11266,26 +11867,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" type="6" precision="0"/>
-        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" type="6" precision="0"/>
-        <field typeName="double precision" name="cone_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" type="6" precision="0"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" length="-1" typeName="double precision" subType="0" name="fence_len" comment="" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" length="-1" typeName="double precision" subType="0" name="fence_len" comment="" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" length="-1" typeName="double precision" subType="0" name="cone_len" comment="" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyLocal="1" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyAlgorithm="0" version="3.8.3-Zanzibar" simplifyMaxScale="1" simplifyDrawingTol="1" readOnly="0" minScale="1e+08" maxScale="0" simplifyDrawingHints="1" styleCategories="AllStyleCategories">
+          <qgis styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" minScale="1e+08" readOnly="0" maxScale="0" simplifyAlgorithm="0" simplifyDrawingHints="1" labelsEnabled="1" simplifyDrawingTol="1" simplifyMaxScale="1" simplifyLocal="1" version="3.8.3-Zanzibar">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 symbollevels="1" enableorderby="0" type="RuleRenderer" forceraster="0">
+            <renderer-v2 symbollevels="1" forceraster="0" enableorderby="0" type="RuleRenderer">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
                 <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
               </rules>
               <symbols>
-                <symbol force_rhr="0" clip_to_extent="1" name="0" alpha="1" type="line">
-                  <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+                <symbol force_rhr="0" alpha="1" name="0" type="line" clip_to_extent="1">
+                  <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                     <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"/>
@@ -11304,9 +11905,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 value="" name="name" type="QString"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -11317,62 +11918,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style isExpression="0" fontCapitals="0" fontFamily="Myriad Pro" fieldName="comment" fontWeight="50" blendMode="0" fontLetterSpacing="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="#ffffff" fontSize="11" fontItalic="0" fontUnderline="0" textOpacity="0.8" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1">
-                      <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-                      <background shapeOffsetY="0" shapeSizeY="1" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeType="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="255,255,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeType="0" shapeOpacity="0.6" shapeJoinStyle="128" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetGlobal="1"/>
+                    <text-style fontWeight="50" fieldName="comment" textOpacity="0.8" isExpression="0" namedStyle="Regular" fontSize="11" fontCapitals="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontItalic="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="#ffffff" blendMode="0" fontLetterSpacing="0" fontWordSpacing="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
+                      <background shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0.6" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeOpacity="0.6" shapeDraw="1" shapeType="0" shapeBlendMode="0" shapeJoinStyle="128" shapeSizeX="1" shapeRotationType="0" shapeSizeY="1"/>
+                      <shadow shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" autoWrapLength="0"/>
-                    <placement repeatDistanceUnits="MM" placementFlags="2" dist="5" rotationAngle="0" distUnits="MM" geometryGenerator="" offsetType="0" xOffset="0" offsetUnits="MM" preserveRotation="1" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="4" priority="5" repeatDistance="0" centroidWhole="0" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" geometryGeneratorType="PointGeometry" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0"/>
-                    <rendering maxNumLabels="2000" obstacleFactor="1" displayAll="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+                    <text-format decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="4294967295"/>
+                    <placement centroidWhole="0" geometryGenerator="" geometryGeneratorType="PointGeometry" repeatDistance="0" repeatDistanceUnits="MM" placementFlags="2" offsetType="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" centroidInside="0" preserveRotation="1" yOffset="0" geometryGeneratorEnabled="0" quadOffset="4" maxCurvedCharAngleOut="-25" priority="5" xOffset="0" dist="5" placement="4" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM"/>
+                    <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="1" obstacle="1" scaleMin="0" limitNumLabels="0" displayAll="1" obstacleType="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" name="name" 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 value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </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 value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
                         </Option>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
                 <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style isExpression="1" fontCapitals="0" fontFamily="Myriad Pro" fieldName="round( $length, 1) || 'm'" fontWeight="63" blendMode="0" fontLetterSpacing="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="#ffffff" fontSize="12" fontItalic="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1">
-                      <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-                      <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeType="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeOpacity="1" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetGlobal="1"/>
+                    <text-style fontWeight="63" fieldName="round( $length, 1) || 'm'" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="12" fontCapitals="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" fontItalic="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="#ffffff" blendMode="0" fontLetterSpacing="0" fontWordSpacing="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
+                      <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeOpacity="1" shapeDraw="0" shapeType="0" shapeBlendMode="0" shapeJoinStyle="64" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0"/>
+                      <shadow shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" autoWrapLength="0"/>
-                    <placement repeatDistanceUnits="MM" placementFlags="15" dist="1" rotationAngle="0" distUnits="MM" geometryGenerator="" offsetType="0" xOffset="0" offsetUnits="MM" preserveRotation="1" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" priority="5" repeatDistance="0" centroidWhole="0" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" geometryGeneratorType="PointGeometry" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0"/>
-                    <rendering maxNumLabels="2000" obstacleFactor="1" displayAll="0" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+                    <text-format decimals="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="4294967295"/>
+                    <placement centroidWhole="0" geometryGenerator="" geometryGeneratorType="PointGeometry" repeatDistance="0" repeatDistanceUnits="MM" placementFlags="15" offsetType="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleIn="25" centroidInside="0" preserveRotation="1" yOffset="0" geometryGeneratorEnabled="0" quadOffset="4" maxCurvedCharAngleOut="-25" priority="5" xOffset="0" dist="1" placement="2" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM"/>
+                    <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" displayAll="0" obstacleType="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" name="name" 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 value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </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 value="true" name="active" type="bool"/>
+                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
+                            <Option value="2" name="type" type="int"/>
                           </Option>
                         </Option>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -11388,18 +11989,18 @@ def my_form_open(dialog, layer, feature):
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" height="15" minimumSize="0" lineSizeType="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" rotationOffset="270" backgroundColor="#ffffff" diagramOrientation="Up" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute field="" color="#000000" label=""/>
+            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+              <DiagramCategory scaleBasedVisibility="0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" rotationOffset="270" penColor="#000000" height="15" penWidth="0" minimumSize="0" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" opacity="1" backgroundColor="#ffffff" minScaleDenominator="0" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings showAll="1" priority="0" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+            <DiagramLayerSettings dist="0" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
               <properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" name="name" type="QString"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" name="type" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
@@ -11487,68 +12088,68 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" index="0" name=""/>
-              <alias field="group" index="1" name=""/>
-              <alias field="comment" index="2" name=""/>
-              <alias field="moveable" index="3" name=""/>
-              <alias field="type" index="4" name=""/>
-              <alias field="name" index="5" name=""/>
-              <alias field="hidden" index="6" name=""/>
-              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-              <alias field="fence_len" index="9" name=""/>
-              <alias field="cone_len" index="10" name=""/>
+              <alias index="0" name="" field="id"/>
+              <alias index="1" name="" field="group"/>
+              <alias index="2" name="" field="comment"/>
+              <alias index="3" name="" field="moveable"/>
+              <alias index="4" name="" field="type"/>
+              <alias index="5" name="" field="name"/>
+              <alias index="6" name="" field="hidden"/>
+              <alias index="7" name="" field="auxiliary_storage_labeling_positiony"/>
+              <alias index="8" name="" field="auxiliary_storage_labeling_positionx"/>
+              <alias index="9" name="" field="fence_len"/>
+              <alias index="10" name="" field="cone_len"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <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=""/>
+              <default expression="" applyOnUpdate="0" field="id"/>
+              <default expression="" applyOnUpdate="0" field="group"/>
+              <default expression="" applyOnUpdate="0" field="comment"/>
+              <default expression="" applyOnUpdate="0" field="moveable"/>
+              <default expression="" applyOnUpdate="0" field="type"/>
+              <default expression="" applyOnUpdate="0" field="name"/>
+              <default expression="" applyOnUpdate="0" field="hidden"/>
+              <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positiony"/>
+              <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positionx"/>
+              <default expression="" applyOnUpdate="0" field="fence_len"/>
+              <default expression="" applyOnUpdate="0" field="cone_len"/>
             </defaults>
             <constraints>
-              <constraint field="id" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="group" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="comment" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="moveable" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="type" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="name" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="hidden" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="auxiliary_storage_labeling_positiony" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="auxiliary_storage_labeling_positionx" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="fence_len" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
-              <constraint field="cone_len" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="group"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="moveable"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hidden"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_positiony"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_positionx"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fence_len"/>
+              <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cone_len"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="id" desc="" exp=""/>
-              <constraint field="group" desc="" exp=""/>
-              <constraint field="comment" desc="" exp=""/>
-              <constraint field="moveable" desc="" exp=""/>
-              <constraint field="type" desc="" exp=""/>
-              <constraint field="name" desc="" exp=""/>
-              <constraint field="hidden" desc="" exp=""/>
-              <constraint field="auxiliary_storage_labeling_positiony" desc="" exp=""/>
-              <constraint field="auxiliary_storage_labeling_positionx" desc="" exp=""/>
-              <constraint field="fence_len" desc="" exp=""/>
-              <constraint field="cone_len" desc="" exp=""/>
+              <constraint desc="" exp="" field="id"/>
+              <constraint desc="" exp="" field="group"/>
+              <constraint desc="" exp="" field="comment"/>
+              <constraint desc="" exp="" field="moveable"/>
+              <constraint desc="" exp="" field="type"/>
+              <constraint desc="" exp="" field="name"/>
+              <constraint desc="" exp="" field="hidden"/>
+              <constraint desc="" exp="" field="auxiliary_storage_labeling_positiony"/>
+              <constraint desc="" exp="" field="auxiliary_storage_labeling_positionx"/>
+              <constraint desc="" exp="" field="fence_len"/>
+              <constraint desc="" exp="" field="cone_len"/>
             </constraintExpressions>
             <expressionfields>
-              <field typeName="double precision" name="fence_len" length="-1" subType="0" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" type="6" precision="0"/>
-              <field typeName="double precision" name="fence_len" length="-1" subType="0" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" type="6" precision="0"/>
-              <field typeName="double precision" name="cone_len" length="-1" subType="0" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" type="6" precision="0"/>
+              <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" typeName="double precision" length="-1" subType="0" name="fence_len" comment="" type="6"/>
+              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" typeName="double precision" length="-1" subType="0" name="fence_len" comment="" type="6"/>
+              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" typeName="double precision" length="-1" subType="0" name="cone_len" comment="" type="6"/>
             </expressionfields>
             <attributeactions>
               <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+            <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
               <columns>
                 <column width="-1" hidden="0" name="id" type="field"/>
                 <column width="-1" hidden="0" name="group" type="field"/>
@@ -11606,18 +12207,18 @@ def my_form_open(dialog, layer, feature):
               <field editable="1" name="type"/>
             </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>
@@ -11634,58 +12235,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="133,182,111,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="133,182,111,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -11716,36 +12317,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="133,182,111,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="95,130,79,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="133,182,111,255" k="color"/>
@@ -11760,44 +12361,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="133,182,111,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="95,130,79,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -11820,64 +12421,64 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="1" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="1" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
           <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
             <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="1" checkstate="0" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" checkstate="0" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
             <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
           </rule>
           <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="4" label="Is Visible" key="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
           <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="round" type="QString"/>
-                <Option name="customdash" value="1;4" type="QString"/>
-                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="customdash_unit" value="Point" 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="round" type="QString"/>
-                <Option name="line_color" value="255,255,0,255" type="QString"/>
-                <Option name="line_style" value="dot" type="QString"/>
-                <Option name="line_width" value="1" 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="1" type="QString"/>
-                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="round" type="QString" name="capstyle"/>
+                <Option value="1;4" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="Point" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="dot" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="round" k="capstyle"/>
@@ -11908,56 +12509,56 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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')" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="round" type="QString"/>
-                <Option name="customdash" value="4;3" 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="round" type="QString"/>
-                <Option name="line_color" value="255,255,0,255" type="QString"/>
-                <Option name="line_style" value="dash" type="QString"/>
-                <Option name="line_width" value="1" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="round" type="QString" name="capstyle"/>
+                <Option value="4;3" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="dash" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="round" k="capstyle"/>
@@ -11988,56 +12589,56 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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')" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="2" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="255,255,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.8" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.8" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12068,56 +12669,56 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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')" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="3" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="0,0,255,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.8" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.8" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12148,56 +12749,56 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="4" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="255,255,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12228,50 +12829,50 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="5" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="5" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="213,180,60,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="213,180,60,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12302,9 +12903,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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12312,35 +12913,35 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{c671f96e-2f37-4e60-9867-9a3746a7e824}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{cf092438-1d21-40b3-8218-4c8ef416cb6a}">
+        <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="comment" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="11" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.80000000000000004" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="50" fieldName="comment" textOpacity="0.80000000000000004" isExpression="0" namedStyle="Regular" fontSize="11" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="1" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="255,255,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.59999999999999998" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeOpacity="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.59999999999999998" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.59999999999999998" shapeType="0" shapeJoinStyle="128" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="1">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,255" type="QString"/>
-                        <Option name="joinstyle" value="round" 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="255,255,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.6" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="255,255,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.6" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12355,118 +12956,118 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="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 value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
-                      <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 value="true" type="bool" name="active"/>
+                        <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="4294967295"/>
-              <placement priority="5" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="5" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8200000000000001" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="4294967295"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="2" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="5" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="14" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="1" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1.8200000000000001" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <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 value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <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 value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{8f0bbb62-12a0-4d1f-856f-8a119d5b6a26}">
+          <rule description="Fence lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}">
             <settings calloutType="simple">
-              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="11" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="11" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="196,60,57,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="196,60,57,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -12489,34 +13090,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12531,112 +13132,112 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="6" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="6" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="2" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="1" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="14" layerType="LineGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="1" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <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="Map" name="PositionX">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <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 value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0" key="{b2f2009a-4ab7-4a86-a46e-7b85998f4204}">
+          <rule description="Cones lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}">
             <settings calloutType="simple">
-              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="11" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="11" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="196,60,57,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="196,60,57,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -12659,34 +13260,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12701,72 +13302,242 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="6" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="6" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="2" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="1" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="14" layerType="LineGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="1" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <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="Map" name="PositionX">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <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 value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}">
+            <settings calloutType="simple">
+              <text-style fontWeight="63" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="11" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
+                <families/>
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option value="" type="QString" name="name"/>
+                        <Option name="properties"/>
+                        <Option value="collection" type="QString" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                      <Option type="Map">
+                        <Option value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="196,60,57,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                      </Option>
+                      <prop v="0" k="angle"/>
+                      <prop v="square" k="cap_style"/>
+                      <prop v="196,60,57,255" k="color"/>
+                      <prop v="1" k="horizontal_anchor_point"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="circle" k="name"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="35,35,35,255" k="outline_color"/>
+                      <prop v="solid" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="diameter" k="scale_method"/>
+                      <prop v="2" k="size"/>
+                      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                      <prop v="MM" k="size_unit"/>
+                      <prop v="1" k="vertical_anchor_point"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" name="name"/>
+                          <Option name="properties"/>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option value="" type="QString" name="name"/>
+                        <Option name="properties"/>
+                        <Option value="collection" type="QString" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                      <Option type="Map">
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
+                      </Option>
+                      <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                      <prop v="255,255,255,255" k="color"/>
+                      <prop v="bevel" k="joinstyle"/>
+                      <prop v="0,0" k="offset"/>
+                      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                      <prop v="MM" k="offset_unit"/>
+                      <prop v="128,128,128,255" k="outline_color"/>
+                      <prop v="no" k="outline_style"/>
+                      <prop v="0" k="outline_width"/>
+                      <prop v="MM" k="outline_width_unit"/>
+                      <prop v="solid" k="style"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" name="name"/>
+                          <Option name="properties"/>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="6" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="2" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="1" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="14" layerType="LineGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
+                    </Option>
+                    <Option type="Map" name="PositionX">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
+                    </Option>
+                    <Option type="Map" name="PositionY">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
+                    </Option>
+                  </Option>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -12775,62 +13546,62 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="&quot;id&quot;" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -12861,9 +13632,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12871,12 +13642,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -12887,70 +13658,70 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="group" configurationFlags="None">
+        <field configurationFlags="None" name="group">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="comment" configurationFlags="None">
+        <field configurationFlags="None" name="comment">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="moveable" configurationFlags="None">
+        <field configurationFlags="None" name="moveable">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="hidden" configurationFlags="None">
+        <field configurationFlags="None" name="hidden">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="fence_len" configurationFlags="None">
+        <field configurationFlags="None" name="fence_len">
           <editWidget type="Hidden">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="cone_len" configurationFlags="None">
+        <field configurationFlags="None" name="cone_len">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -12959,74 +13730,74 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="day" index="7" name=""/>
-        <alias field="fence_len" index="8" name=""/>
-        <alias field="cone_len" index="9" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="comment"/>
+        <alias index="3" name="" field="moveable"/>
+        <alias index="4" name="" field="type"/>
+        <alias index="5" name="" field="name"/>
+        <alias index="6" name="" field="hidden"/>
+        <alias index="7" name="" field="day"/>
+        <alias index="8" name="" field="fence_len"/>
+        <alias index="9" name="" field="cone_len"/>
       </aliases>
       <defaults>
-        <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=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="comment"/>
+        <default expression="" applyOnUpdate="0" field="moveable"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="hidden"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="fence_len"/>
+        <default expression="" applyOnUpdate="0" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="group" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="comment" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="moveable" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="hidden" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="fence_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="cone_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="group"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="comment"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="moveable"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="hidden"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="fence_len"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="cone_len"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="group" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="moveable" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="hidden" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="fence_len" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="comment"/>
+        <constraint desc="" exp="" field="moveable"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="hidden"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="fence_len"/>
+        <constraint desc="" exp="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" type="6" precision="0"/>
-        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" type="6" precision="0"/>
-        <field typeName="double precision" name="cone_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" type="6" precision="0"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" length="-1" typeName="double precision" subType="0" name="fence_len" comment="" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" length="-1" typeName="double precision" subType="0" name="fence_len" comment="" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" length="-1" typeName="double precision" subType="0" name="cone_len" comment="" type="6"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="group" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="group"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="373" hidden="0" name="comment" type="field"/>
-          <column width="-1" hidden="0" name="moveable" type="field"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
-          <column width="692" hidden="0" name="name" type="field"/>
-          <column width="-1" hidden="0" name="hidden" type="field"/>
-          <column width="-1" hidden="0" name="fence_len" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="-1" hidden="0" name="cone_len" type="field"/>
+          <column width="373" hidden="0" type="field" name="comment"/>
+          <column width="-1" hidden="0" type="field" name="moveable"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
+          <column width="692" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="hidden"/>
+          <column width="-1" hidden="0" type="field" name="fence_len"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="-1" hidden="0" type="field" name="cone_len"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13073,38 +13844,38 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -13177,58 +13948,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="164,113,88,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="164,113,88,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -13259,36 +14030,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="164,113,88,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="117,81,63,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="164,113,88,255" k="color"/>
@@ -13303,44 +14074,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="164,113,88,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="117,81,63,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -13363,54 +14134,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="0,178,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="1" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,178,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -13441,9 +14212,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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13454,60 +14225,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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" value="&quot;id&quot;" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -13538,9 +14309,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13548,12 +14319,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -13564,7 +14335,7 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -13573,24 +14344,24 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias index="0" name="" field="id"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
           <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
@@ -13626,7 +14397,7 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13634,7 +14405,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -13707,58 +14478,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="213,180,60,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="213,180,60,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -13789,36 +14560,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="213,180,60,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="152,129,43,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="213,180,60,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="152,129,43,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="213,180,60,255" k="color"/>
@@ -13833,44 +14604,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="213,180,60,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="152,129,43,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="213,180,60,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="152,129,43,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -13893,38 +14664,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="26,0,201,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="0,0,0,255" type="QString"/>
-                <Option name="outline_style" value="dot" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="b_diagonal" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="26,0,201,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="dot" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="b_diagonal" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="26,0,201,255" k="color"/>
@@ -13939,9 +14710,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13952,10 +14723,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
@@ -13966,56 +14738,56 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -14046,9 +14818,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14056,18 +14828,18 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" value="true" type="bool"/>
-                <Option name="field" value="id" type="QString"/>
-                <Option name="type" value="2" type="int"/>
+            <Option value="" type="QString" name="name"/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option value="true" type="bool" name="active"/>
+                <Option value="id" type="QString" name="field"/>
+                <Option value="2" type="int" name="type"/>
               </Option>
             </Option>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -14078,37 +14850,37 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="page" configurationFlags="None">
+        <field configurationFlags="None" name="page">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
@@ -14117,40 +14889,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="page"/>
+        <alias index="3" name="" field="day"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="page" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="page"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="page" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="page"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="page" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="page"/>
+        <constraint desc="" exp="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;page&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;">
         <columns>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="-1" hidden="0" name="page" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="-1" hidden="0" type="field" name="page"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14187,9 +14959,9 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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/>
@@ -14197,7 +14969,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -14262,7 +15034,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14273,7 +15045,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join upsertOnEdit="0" joinLayerId="marshals_by_position20161003112326575" editable="0" dynamicForm="0" customPrefix="csv_" targetFieldName="position" memoryCache="0" cascadedDelete="0" joinFieldName="position" hasCustomPrefix="1">
+        <join upsertOnEdit="0" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" customPrefix="csv_" targetFieldName="position" memoryCache="0" editable="0" cascadedDelete="0" dynamicForm="0">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="club"/>
@@ -14300,58 +15072,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="id" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="id">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="114,155,111,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="114,155,111,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -14382,36 +15154,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="114,155,111,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="81,111,79,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="81,111,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -14426,44 +15198,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="114,155,111,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="81,111,79,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="81,111,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14486,51 +15258,51 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" description="Show in marshal overview" label="Show by day in marshal plan" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" checkstate="0" symbol="1" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0" symbol="2" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" label="Show by day in marshal plan" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" symbol="1" checkstate="0" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" checkstate="0" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="0.8" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="0.8" type="marker" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
+            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="name" value="circle" 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="0,0,0,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="5" type="QString"/>
-                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="size_unit" value="Pixel" type="QString"/>
-                <Option name="vertical_anchor_point" value="1" type="QString"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="5" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="Pixel" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14553,42 +15325,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="0.8" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="0.8" type="marker" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
+            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="name" value="circle" 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="0,0,0,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="5" type="QString"/>
-                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="size_unit" value="Pixel" type="QString"/>
-                <Option name="vertical_anchor_point" value="1" type="QString"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="5" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="Pixel" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14611,42 +15383,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="0.01" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="0.01" type="marker" name="2" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
+            <layer pass="1" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="0,0,0,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0" 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="0.1" 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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="0.1" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14669,9 +15441,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14680,42 +15452,42 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{02580e06-5c28-4087-a4e2-d2705453c9fb}">
-          <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="{ce06e431-d417-4afe-97fa-8d4bf9e0207e}">
+          <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ce06e431-d417-4afe-97fa-8d4bf9e0207e}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="position" textOpacity="0.90000000000000002" isExpression="0" namedStyle="Semibold" fontSize="6" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.5" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="231,113,72,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="231,113,72,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -14738,34 +15510,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.1" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -14780,118 +15552,118 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="2" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="1" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="0" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="2" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" active="0" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{cad8c7f8-97e6-4c3e-89c4-6166bfc5203d}">
+          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" active="0" key="{cad8c7f8-97e6-4c3e-89c4-6166bfc5203d}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="position" textOpacity="0.90000000000000002" isExpression="0" namedStyle="Semibold" fontSize="6" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.5" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="231,113,72,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="231,113,72,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -14914,34 +15686,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.1" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -14956,110 +15728,110 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="2" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="1" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="0" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="2" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{d218bee5-b5a9-4347-ae20-a3b23b9aa8b5}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" filter="'marshal' = attribute( @atlas_feature , 'type' )" active="0" key="{d218bee5-b5a9-4347-ae20-a3b23b9aa8b5}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.5" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="position" textOpacity="0.5" isExpression="0" namedStyle="Semibold" fontSize="6" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.5" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeY="0.20000000000000001">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.4" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15074,189 +15846,189 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( @atlasfeature_id = $id, 1, 0)" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="AlwaysShow">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="FontOpacity" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="FontOpacity">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="FontStyle">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="ObstacleFactor">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="Priority" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="Priority">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="ShapeOpacity">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( @atlas_featureid = $id, 8, 6 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="Size">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
-                      <Option name="ZIndex" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString"/>
-                        <Option name="type" value="3" type="int"/>
+                      <Option type="Map" name="ZIndex">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
-              <placement priority="8" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="5" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="1"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="8" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="0" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1.8" minFeatureSize="0" upsidedownLabels="0" zIndex="5" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlasfeature_id = $id, 1, 0)" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="Priority">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlas_featureid = $id, 8, 6 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="Size">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'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="{91072baf-d72c-4be6-b15f-54994870beac}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{91072baf-d72c-4be6-b15f-54994870beac}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.59999999999999998" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="50" fieldName="position" textOpacity="0.59999999999999998" isExpression="0" namedStyle="Regular" fontSize="6" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.59999999999999998" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeY="0.20000000000000001">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="213,180,60,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="213,180,60,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -15279,34 +16051,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.4" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15321,148 +16093,148 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
-              <placement priority="8" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="5" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="1"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="8" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="0" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1.8" minFeatureSize="0" upsidedownLabels="0" zIndex="5" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Priority">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'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="{dbd6b3f9-ec3f-436c-ac51-c7866d412105}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{dbd6b3f9-ec3f-436c-ac51-c7866d412105}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="position" textOpacity="0.90000000000000002" isExpression="0" namedStyle="Semibold" fontSize="8" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeOpacity="0.90000000000000002" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,0,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.90000000000000002" shapeType="3" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeY="0.20000000000000001">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="133,182,111,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="133,182,111,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -15485,34 +16257,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,0,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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.4" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,0,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,0,255" k="color"/>
@@ -15527,108 +16299,108 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="false" type="bool"/>
-                              <Option name="type" value="1" type="int"/>
-                              <Option name="val" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
-              <placement priority="10" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="10" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="1"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="0" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="0" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="1.8" minFeatureSize="0" upsidedownLabels="0" zIndex="10" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Priority">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -15637,10 +16409,10 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
@@ -15652,191 +16424,191 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
-          <Option name="labeling/angleOffset" value="0" type="QString"/>
-          <Option name="labeling/blendMode" value="0" type="QString"/>
-          <Option name="labeling/bufferBlendMode" value="0" type="QString"/>
-          <Option name="labeling/bufferColorA" value="255" type="QString"/>
-          <Option name="labeling/bufferColorB" value="255" type="QString"/>
-          <Option name="labeling/bufferColorG" value="255" type="QString"/>
-          <Option name="labeling/bufferColorR" value="255" type="QString"/>
-          <Option name="labeling/bufferDraw" value="false" type="QString"/>
-          <Option name="labeling/bufferJoinStyle" value="64" type="QString"/>
-          <Option name="labeling/bufferNoFill" value="false" type="QString"/>
-          <Option name="labeling/bufferSize" value="1" type="QString"/>
-          <Option name="labeling/bufferSizeInMapUnits" value="false" type="QString"/>
-          <Option name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/bufferTransp" value="0" type="QString"/>
-          <Option name="labeling/centroidInside" value="false" type="QString"/>
-          <Option name="labeling/centroidWhole" value="false" type="QString"/>
-          <Option name="labeling/decimals" value="3" type="QString"/>
-          <Option name="labeling/displayAll" value="false" type="QString"/>
-          <Option name="labeling/dist" value="0" type="QString"/>
-          <Option name="labeling/distInMapUnits" value="false" type="QString"/>
-          <Option name="labeling/distMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/drawLabels" value="false" type="QString"/>
-          <Option name="labeling/enabled" value="false" type="QString"/>
-          <Option name="labeling/fieldName" value="position" type="QString"/>
-          <Option name="labeling/fitInPolygonOnly" value="false" type="QString"/>
-          <Option name="labeling/fontCapitals" value="0" type="QString"/>
-          <Option name="labeling/fontFamily" value="Myriad Pro" type="QString"/>
-          <Option name="labeling/fontItalic" value="false" type="QString"/>
-          <Option name="labeling/fontLetterSpacing" value="0" type="QString"/>
-          <Option name="labeling/fontLimitPixelSize" value="false" type="QString"/>
-          <Option name="labeling/fontMaxPixelSize" value="10000" type="QString"/>
-          <Option name="labeling/fontMinPixelSize" value="3" type="QString"/>
-          <Option name="labeling/fontSize" value="10" type="QString"/>
-          <Option name="labeling/fontSizeInMapUnits" value="false" type="QString"/>
-          <Option name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/fontStrikeout" value="false" type="QString"/>
-          <Option name="labeling/fontUnderline" value="false" type="QString"/>
-          <Option name="labeling/fontWeight" value="63" type="QString"/>
-          <Option name="labeling/fontWordSpacing" value="0" type="QString"/>
-          <Option name="labeling/formatNumbers" value="false" type="QString"/>
-          <Option name="labeling/isExpression" value="false" type="QString"/>
-          <Option name="labeling/labelOffsetInMapUnits" value="true" type="QString"/>
-          <Option name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/labelPerPart" value="false" type="QString"/>
-          <Option name="labeling/leftDirectionSymbol" value="&lt;" type="QString"/>
-          <Option name="labeling/limitNumLabels" value="false" type="QString"/>
-          <Option name="labeling/maxCurvedCharAngleIn" value="20" type="QString"/>
-          <Option name="labeling/maxCurvedCharAngleOut" value="-20" type="QString"/>
-          <Option name="labeling/maxNumLabels" value="2000" type="QString"/>
-          <Option name="labeling/mergeLines" value="false" type="QString"/>
-          <Option name="labeling/minFeatureSize" value="0" type="QString"/>
-          <Option name="labeling/multilineAlign" value="0" type="QString"/>
-          <Option name="labeling/multilineHeight" value="1" type="QString"/>
-          <Option name="labeling/namedStyle" value="Semibold" type="QString"/>
-          <Option name="labeling/obstacle" value="true" type="QString"/>
-          <Option name="labeling/obstacleFactor" value="1" type="QString"/>
-          <Option name="labeling/obstacleType" value="0" type="QString"/>
-          <Option name="labeling/offsetType" value="0" type="QString"/>
-          <Option name="labeling/placeDirectionSymbol" value="0" type="QString"/>
-          <Option name="labeling/placement" value="0" type="QString"/>
-          <Option name="labeling/placementFlags" value="10" type="QString"/>
-          <Option name="labeling/plussign" value="false" type="QString"/>
-          <Option name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString"/>
-          <Option name="labeling/preserveRotation" value="true" type="QString"/>
-          <Option name="labeling/previewBkgrdColor" value="#ffffff" type="QString"/>
-          <Option name="labeling/priority" value="5" type="QString"/>
-          <Option name="labeling/quadOffset" value="4" type="QString"/>
-          <Option name="labeling/repeatDistance" value="0" type="QString"/>
-          <Option name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/repeatDistanceUnit" value="1" type="QString"/>
-          <Option name="labeling/reverseDirectionSymbol" value="false" type="QString"/>
-          <Option name="labeling/rightDirectionSymbol" value=">" type="QString"/>
-          <Option name="labeling/scaleMax" value="10000000" type="QString"/>
-          <Option name="labeling/scaleMin" value="1" type="QString"/>
-          <Option name="labeling/scaleVisibility" value="false" type="QString"/>
-          <Option name="labeling/shadowBlendMode" value="6" type="QString"/>
-          <Option name="labeling/shadowColorB" value="0" type="QString"/>
-          <Option name="labeling/shadowColorG" value="0" type="QString"/>
-          <Option name="labeling/shadowColorR" value="0" type="QString"/>
-          <Option name="labeling/shadowDraw" value="false" type="QString"/>
-          <Option name="labeling/shadowOffsetAngle" value="135" type="QString"/>
-          <Option name="labeling/shadowOffsetDist" value="1" type="QString"/>
-          <Option name="labeling/shadowOffsetGlobal" value="true" type="QString"/>
-          <Option name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shadowOffsetUnits" value="1" type="QString"/>
-          <Option name="labeling/shadowRadius" value="1.5" type="QString"/>
-          <Option name="labeling/shadowRadiusAlphaOnly" value="false" type="QString"/>
-          <Option name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shadowRadiusUnits" value="1" type="QString"/>
-          <Option name="labeling/shadowScale" value="100" type="QString"/>
-          <Option name="labeling/shadowTransparency" value="30" type="QString"/>
-          <Option name="labeling/shadowUnder" value="0" type="QString"/>
-          <Option name="labeling/shapeBlendMode" value="0" type="QString"/>
-          <Option name="labeling/shapeBorderColorA" value="255" type="QString"/>
-          <Option name="labeling/shapeBorderColorB" value="128" type="QString"/>
-          <Option name="labeling/shapeBorderColorG" value="128" type="QString"/>
-          <Option name="labeling/shapeBorderColorR" value="128" type="QString"/>
-          <Option name="labeling/shapeBorderWidth" value="0" type="QString"/>
-          <Option name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeBorderWidthUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeDraw" value="true" type="QString"/>
-          <Option name="labeling/shapeFillColorA" value="255" type="QString"/>
-          <Option name="labeling/shapeFillColorB" value="138" type="QString"/>
-          <Option name="labeling/shapeFillColorG" value="0" type="QString"/>
-          <Option name="labeling/shapeFillColorR" value="101" type="QString"/>
-          <Option name="labeling/shapeJoinStyle" value="64" type="QString"/>
-          <Option name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeOffsetUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeOffsetX" value="0" type="QString"/>
-          <Option name="labeling/shapeOffsetY" value="0" type="QString"/>
-          <Option name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeRadiiUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeRadiiX" value="0" type="QString"/>
-          <Option name="labeling/shapeRadiiY" value="0" type="QString"/>
-          <Option name="labeling/shapeRotation" value="0" type="QString"/>
-          <Option name="labeling/shapeRotationType" value="0" type="QString"/>
-          <Option name="labeling/shapeSVGFile" value="" type="QString"/>
-          <Option name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0" type="QString"/>
-          <Option name="labeling/shapeSizeType" value="0" type="QString"/>
-          <Option name="labeling/shapeSizeUnits" value="1" type="QString"/>
-          <Option name="labeling/shapeSizeX" value="0" type="QString"/>
-          <Option name="labeling/shapeSizeY" value="0" type="QString"/>
-          <Option name="labeling/shapeTransparency" value="0" type="QString"/>
-          <Option name="labeling/shapeType" value="0" type="QString"/>
-          <Option name="labeling/textColorA" value="255" type="QString"/>
-          <Option name="labeling/textColorB" value="255" type="QString"/>
-          <Option name="labeling/textColorG" value="255" type="QString"/>
-          <Option name="labeling/textColorR" value="255" type="QString"/>
-          <Option name="labeling/textTransp" value="0" type="QString"/>
-          <Option name="labeling/upsidedownLabels" value="0" type="QString"/>
-          <Option name="labeling/wrapChar" value="" type="QString"/>
-          <Option name="labeling/xOffset" value="0" type="QString"/>
-          <Option name="labeling/yOffset" value="0" type="QString"/>
-          <Option name="labeling/zIndex" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/angleOffset"/>
+          <Option value="0" type="QString" name="labeling/blendMode"/>
+          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
+          <Option value="255" type="QString" name="labeling/bufferColorA"/>
+          <Option value="255" type="QString" name="labeling/bufferColorB"/>
+          <Option value="255" type="QString" name="labeling/bufferColorG"/>
+          <Option value="255" type="QString" name="labeling/bufferColorR"/>
+          <Option value="false" type="QString" name="labeling/bufferDraw"/>
+          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
+          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
+          <Option value="1" type="QString" name="labeling/bufferSize"/>
+          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/bufferTransp"/>
+          <Option value="false" type="QString" name="labeling/centroidInside"/>
+          <Option value="false" type="QString" name="labeling/centroidWhole"/>
+          <Option value="3" type="QString" name="labeling/decimals"/>
+          <Option value="false" type="QString" name="labeling/displayAll"/>
+          <Option value="0" type="QString" name="labeling/dist"/>
+          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/drawLabels"/>
+          <Option value="false" type="QString" name="labeling/enabled"/>
+          <Option value="position" type="QString" name="labeling/fieldName"/>
+          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
+          <Option value="0" type="QString" name="labeling/fontCapitals"/>
+          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
+          <Option value="false" type="QString" name="labeling/fontItalic"/>
+          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
+          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
+          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
+          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
+          <Option value="10" type="QString" name="labeling/fontSize"/>
+          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
+          <Option value="false" type="QString" name="labeling/fontUnderline"/>
+          <Option value="63" type="QString" name="labeling/fontWeight"/>
+          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
+          <Option value="false" type="QString" name="labeling/formatNumbers"/>
+          <Option value="false" type="QString" name="labeling/isExpression"/>
+          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/labelPerPart"/>
+          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
+          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
+          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
+          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
+          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
+          <Option value="false" type="QString" name="labeling/mergeLines"/>
+          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
+          <Option value="0" type="QString" name="labeling/multilineAlign"/>
+          <Option value="1" type="QString" name="labeling/multilineHeight"/>
+          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
+          <Option value="true" type="QString" name="labeling/obstacle"/>
+          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
+          <Option value="0" type="QString" name="labeling/obstacleType"/>
+          <Option value="0" type="QString" name="labeling/offsetType"/>
+          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/placement"/>
+          <Option value="10" type="QString" name="labeling/placementFlags"/>
+          <Option value="false" type="QString" name="labeling/plussign"/>
+          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
+          <Option value="true" type="QString" name="labeling/preserveRotation"/>
+          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
+          <Option value="5" type="QString" name="labeling/priority"/>
+          <Option value="4" type="QString" name="labeling/quadOffset"/>
+          <Option value="0" type="QString" name="labeling/repeatDistance"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
+          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
+          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
+          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
+          <Option value="1" type="QString" name="labeling/scaleMin"/>
+          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
+          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
+          <Option value="0" type="QString" name="labeling/shadowColorB"/>
+          <Option value="0" type="QString" name="labeling/shadowColorG"/>
+          <Option value="0" type="QString" name="labeling/shadowColorR"/>
+          <Option value="false" type="QString" name="labeling/shadowDraw"/>
+          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
+          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
+          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
+          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
+          <Option value="100" type="QString" name="labeling/shadowScale"/>
+          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
+          <Option value="0" type="QString" name="labeling/shadowUnder"/>
+          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
+          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
+          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
+          <Option value="true" type="QString" name="labeling/shapeDraw"/>
+          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
+          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
+          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
+          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
+          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
+          <Option value="0" type="QString" name="labeling/shapeRotation"/>
+          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
+          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
+          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
+          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
+          <Option value="0" type="QString" name="labeling/shapeType"/>
+          <Option value="255" type="QString" name="labeling/textColorA"/>
+          <Option value="255" type="QString" name="labeling/textColorB"/>
+          <Option value="255" type="QString" name="labeling/textColorG"/>
+          <Option value="255" type="QString" name="labeling/textColorR"/>
+          <Option value="0" type="QString" name="labeling/textTransp"/>
+          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
+          <Option value="" type="QString" name="labeling/wrapChar"/>
+          <Option value="0" type="QString" name="labeling/xOffset"/>
+          <Option value="0" type="QString" name="labeling/yOffset"/>
+          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -15867,9 +16639,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15877,12 +16649,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -15893,116 +16665,116 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="false" type="bool"/>
-                <Option name="UseHtml" value="false" type="bool"/>
+                <Option value="false" type="bool" name="IsMultiline"/>
+                <Option value="false" type="bool" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="false" type="bool"/>
-                <Option name="UseHtml" value="false" type="bool"/>
+                <Option value="false" type="bool" name="IsMultiline"/>
+                <Option value="false" type="bool" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="notes" configurationFlags="None">
+        <field configurationFlags="None" name="notes">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="xyposition" configurationFlags="None">
+        <field configurationFlags="None" name="xyposition">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_position" configurationFlags="None">
+        <field configurationFlags="None" name="csv_position">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_club" configurationFlags="None">
+        <field configurationFlags="None" name="csv_club">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="csv_firstname" configurationFlags="None">
+        <field configurationFlags="None" name="csv_firstname">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_surname" configurationFlags="None">
+        <field configurationFlags="None" name="csv_surname">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_days" configurationFlags="None">
+        <field configurationFlags="None" name="csv_days">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_first_runner" configurationFlags="None">
+        <field configurationFlags="None" name="csv_first_runner">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_last_runner" configurationFlags="None">
+        <field configurationFlags="None" name="csv_last_runner">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_instructions" configurationFlags="None">
+        <field configurationFlags="None" name="csv_instructions">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -16011,90 +16783,90 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="xyposition" index="4" name=""/>
-        <alias field="day" index="5" name=""/>
-        <alias field="csv_position" index="6" name=""/>
-        <alias field="csv_club" index="7" name=""/>
-        <alias field="csv_firstname" index="8" name=""/>
-        <alias field="csv_surname" index="9" name=""/>
-        <alias field="csv_days" index="10" name=""/>
-        <alias field="csv_first_runner" index="11" name=""/>
-        <alias field="csv_last_runner" index="12" name=""/>
-        <alias field="csv_instructions" index="13" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="position"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="notes"/>
+        <alias index="4" name="" field="xyposition"/>
+        <alias index="5" name="" field="day"/>
+        <alias index="6" name="" field="csv_position"/>
+        <alias index="7" name="" field="csv_club"/>
+        <alias index="8" name="" field="csv_firstname"/>
+        <alias index="9" name="" field="csv_surname"/>
+        <alias index="10" name="" field="csv_days"/>
+        <alias index="11" name="" field="csv_first_runner"/>
+        <alias index="12" name="" field="csv_last_runner"/>
+        <alias index="13" name="" field="csv_instructions"/>
       </aliases>
       <defaults>
-        <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="xyposition" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="csv_position" applyOnUpdate="0" expression=""/>
-        <default field="csv_club" applyOnUpdate="0" expression=""/>
-        <default field="csv_firstname" applyOnUpdate="0" expression=""/>
-        <default field="csv_surname" applyOnUpdate="0" expression=""/>
-        <default field="csv_days" applyOnUpdate="0" expression=""/>
-        <default field="csv_first_runner" applyOnUpdate="0" expression=""/>
-        <default field="csv_last_runner" applyOnUpdate="0" expression=""/>
-        <default field="csv_instructions" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="position"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="notes"/>
+        <default expression="" applyOnUpdate="0" field="xyposition"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="csv_position"/>
+        <default expression="" applyOnUpdate="0" field="csv_club"/>
+        <default expression="" applyOnUpdate="0" field="csv_firstname"/>
+        <default expression="" applyOnUpdate="0" field="csv_surname"/>
+        <default expression="" applyOnUpdate="0" field="csv_days"/>
+        <default expression="" applyOnUpdate="0" field="csv_first_runner"/>
+        <default expression="" applyOnUpdate="0" field="csv_last_runner"/>
+        <default expression="" applyOnUpdate="0" field="csv_instructions"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="notes" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="xyposition" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_club" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_firstname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_surname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_days" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_first_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_last_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="csv_instructions" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="position"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="notes"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="xyposition"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_position"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_club"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_firstname"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_surname"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_days"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_first_runner"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_last_runner"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="csv_instructions"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="notes" desc="" exp=""/>
-        <constraint field="xyposition" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="csv_position" desc="" exp=""/>
-        <constraint field="csv_club" desc="" exp=""/>
-        <constraint field="csv_firstname" desc="" exp=""/>
-        <constraint field="csv_surname" desc="" exp=""/>
-        <constraint field="csv_days" desc="" exp=""/>
-        <constraint field="csv_first_runner" desc="" exp=""/>
-        <constraint field="csv_last_runner" desc="" exp=""/>
-        <constraint field="csv_instructions" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="position"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="notes"/>
+        <constraint desc="" exp="" field="xyposition"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="csv_position"/>
+        <constraint desc="" exp="" field="csv_club"/>
+        <constraint desc="" exp="" field="csv_firstname"/>
+        <constraint desc="" exp="" field="csv_surname"/>
+        <constraint desc="" exp="" field="csv_days"/>
+        <constraint desc="" exp="" field="csv_first_runner"/>
+        <constraint desc="" exp="" field="csv_last_runner"/>
+        <constraint desc="" exp="" field="csv_instructions"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="position" type="field"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
-          <column width="-1" hidden="0" name="notes" type="field"/>
-          <column width="-1" hidden="0" name="xyposition" type="field"/>
-          <column width="-1" hidden="0" name="csv_club" type="field"/>
-          <column width="-1" hidden="0" name="csv_first_runner" type="field"/>
-          <column width="-1" hidden="0" name="csv_last_runner" type="field"/>
-          <column width="-1" hidden="0" name="csv_firstname" type="field"/>
-          <column width="-1" hidden="0" name="csv_surname" type="field"/>
-          <column width="-1" hidden="0" name="csv_position" type="field"/>
-          <column width="-1" hidden="0" name="csv_days" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="-1" hidden="0" name="csv_instructions" type="field"/>
+          <column width="-1" hidden="0" type="field" name="position"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
+          <column width="-1" hidden="0" type="field" name="notes"/>
+          <column width="-1" hidden="0" type="field" name="xyposition"/>
+          <column width="-1" hidden="0" type="field" name="csv_club"/>
+          <column width="-1" hidden="0" type="field" name="csv_first_runner"/>
+          <column width="-1" hidden="0" type="field" name="csv_last_runner"/>
+          <column width="-1" hidden="0" type="field" name="csv_firstname"/>
+          <column width="-1" hidden="0" type="field" name="csv_surname"/>
+          <column width="-1" hidden="0" type="field" name="csv_position"/>
+          <column width="-1" hidden="0" type="field" name="csv_days"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="-1" hidden="0" type="field" name="csv_instructions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16162,63 +16934,63 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="xyposition"/>
       </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_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_races" labelOnTop="0"/>
-        <field name="csv_surname" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="id" 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_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_races"/>
+        <field labelOnTop="0" name="csv_surname"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <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_days" reuseLastValue="0"/>
-        <field name="csv_email" reuseLastValue="0"/>
-        <field name="csv_first_runner" reuseLastValue="0"/>
-        <field name="csv_firstname" reuseLastValue="0"/>
-        <field name="csv_instructions" reuseLastValue="0"/>
-        <field name="csv_last_runner" reuseLastValue="0"/>
-        <field name="csv_name" reuseLastValue="0"/>
-        <field name="csv_phone" reuseLastValue="0"/>
-        <field name="csv_position" reuseLastValue="0"/>
-        <field name="csv_races" reuseLastValue="0"/>
-        <field name="csv_surname" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="notes" reuseLastValue="0"/>
-        <field name="position" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
-        <field name="xyposition" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="csv_captain"/>
+        <field reuseLastValue="0" name="csv_captain_email"/>
+        <field reuseLastValue="0" name="csv_captain_phone"/>
+        <field reuseLastValue="0" name="csv_club"/>
+        <field reuseLastValue="0" name="csv_days"/>
+        <field reuseLastValue="0" name="csv_email"/>
+        <field reuseLastValue="0" name="csv_first_runner"/>
+        <field reuseLastValue="0" name="csv_firstname"/>
+        <field reuseLastValue="0" name="csv_instructions"/>
+        <field reuseLastValue="0" name="csv_last_runner"/>
+        <field reuseLastValue="0" name="csv_name"/>
+        <field reuseLastValue="0" name="csv_phone"/>
+        <field reuseLastValue="0" name="csv_position"/>
+        <field reuseLastValue="0" name="csv_races"/>
+        <field reuseLastValue="0" name="csv_surname"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="notes"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="type"/>
+        <field reuseLastValue="0" name="xyposition"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -16268,7 +17040,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" geometry="No geometry" type="vector" minScale="1e+08" readOnly="0" maxScale="100000" refreshOnNotifyMessage="" wkbType="NoGeometry" styleCategories="AllStyleCategories">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" geometry="No geometry" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08" readOnly="0" maxScale="100000" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" type="vector" wkbType="NoGeometry" legendPlaceholderImage="">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -16321,7 +17093,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16334,8 +17106,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="marshal_positions20160930121322287"/>
         <layer id="all_routes20170907054841602"/>
+        <layer id="marshal_positions20160930121322287"/>
       </dataDependencies>
       <expressionfields/>
       <map-layer-style-manager current="default">
@@ -16349,58 +17121,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="243,166,178,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -16431,36 +17203,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="243,166,178,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="174,119,127,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="243,166,178,255" k="color"/>
@@ -16475,44 +17247,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="243,166,178,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="174,119,127,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -16535,9 +17307,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16546,13 +17318,13 @@ 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" value="first_name" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="first_name" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
@@ -16562,126 +17334,126 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="club" configurationFlags="None">
+        <field configurationFlags="None" name="club">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="firstname" configurationFlags="None">
+        <field configurationFlags="None" name="firstname">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="surname" configurationFlags="None">
+        <field configurationFlags="None" name="surname">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="phone" configurationFlags="None">
+        <field configurationFlags="None" name="phone">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="email" configurationFlags="None">
+        <field configurationFlags="None" name="email">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="captain" configurationFlags="None">
+        <field configurationFlags="None" name="captain">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="captain_phone" configurationFlags="None">
+        <field configurationFlags="None" name="captain_phone">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="captain_email" configurationFlags="None">
+        <field configurationFlags="None" name="captain_email">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="days" configurationFlags="None">
+        <field configurationFlags="None" name="days">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="races" configurationFlags="None">
+        <field configurationFlags="None" name="races">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="first_runner" configurationFlags="None">
+        <field configurationFlags="None" name="first_runner">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="last_runner" configurationFlags="None">
+        <field configurationFlags="None" name="last_runner">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="instructions" configurationFlags="None">
+        <field configurationFlags="None" name="instructions">
           <editWidget type="">
             <config>
               <Option/>
@@ -16690,94 +17462,94 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="position" index="0" name=""/>
-        <alias field="club" index="1" name=""/>
-        <alias field="firstname" index="2" name=""/>
-        <alias field="surname" index="3" name=""/>
-        <alias field="name" index="4" name=""/>
-        <alias field="phone" index="5" name=""/>
-        <alias field="email" index="6" name=""/>
-        <alias field="captain" index="7" name=""/>
-        <alias field="captain_phone" index="8" name=""/>
-        <alias field="captain_email" index="9" name=""/>
-        <alias field="days" index="10" name=""/>
-        <alias field="races" index="11" name=""/>
-        <alias field="first_runner" index="12" name=""/>
-        <alias field="last_runner" index="13" name=""/>
-        <alias field="instructions" index="14" name=""/>
+        <alias index="0" name="" field="position"/>
+        <alias index="1" name="" field="club"/>
+        <alias index="2" name="" field="firstname"/>
+        <alias index="3" name="" field="surname"/>
+        <alias index="4" name="" field="name"/>
+        <alias index="5" name="" field="phone"/>
+        <alias index="6" name="" field="email"/>
+        <alias index="7" name="" field="captain"/>
+        <alias index="8" name="" field="captain_phone"/>
+        <alias index="9" name="" field="captain_email"/>
+        <alias index="10" name="" field="days"/>
+        <alias index="11" name="" field="races"/>
+        <alias index="12" name="" field="first_runner"/>
+        <alias index="13" name="" field="last_runner"/>
+        <alias index="14" name="" field="instructions"/>
       </aliases>
       <defaults>
-        <default field="position" applyOnUpdate="0" expression=""/>
-        <default field="club" applyOnUpdate="0" expression=""/>
-        <default field="firstname" applyOnUpdate="0" expression=""/>
-        <default field="surname" applyOnUpdate="0" expression=""/>
-        <default field="name" 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="captain_email" applyOnUpdate="0" expression=""/>
-        <default field="days" applyOnUpdate="0" expression=""/>
-        <default field="races" applyOnUpdate="0" expression=""/>
-        <default field="first_runner" applyOnUpdate="0" expression=""/>
-        <default field="last_runner" applyOnUpdate="0" expression=""/>
-        <default field="instructions" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="position"/>
+        <default expression="" applyOnUpdate="0" field="club"/>
+        <default expression="" applyOnUpdate="0" field="firstname"/>
+        <default expression="" applyOnUpdate="0" field="surname"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="phone"/>
+        <default expression="" applyOnUpdate="0" field="email"/>
+        <default expression="" applyOnUpdate="0" field="captain"/>
+        <default expression="" applyOnUpdate="0" field="captain_phone"/>
+        <default expression="" applyOnUpdate="0" field="captain_email"/>
+        <default expression="" applyOnUpdate="0" field="days"/>
+        <default expression="" applyOnUpdate="0" field="races"/>
+        <default expression="" applyOnUpdate="0" field="first_runner"/>
+        <default expression="" applyOnUpdate="0" field="last_runner"/>
+        <default expression="" applyOnUpdate="0" field="instructions"/>
       </defaults>
       <constraints>
-        <constraint field="position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="club" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="firstname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="surname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="phone" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="email" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="captain" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="captain_phone" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="captain_email" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="days" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="races" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="first_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="last_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="instructions" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="position"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="club"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="firstname"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="surname"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="phone"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="email"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="captain"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="captain_phone"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="captain_email"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="days"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="races"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="first_runner"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="last_runner"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="instructions"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="club" desc="" exp=""/>
-        <constraint field="firstname" desc="" exp=""/>
-        <constraint field="surname" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="phone" desc="" exp=""/>
-        <constraint field="email" desc="" exp=""/>
-        <constraint field="captain" desc="" exp=""/>
-        <constraint field="captain_phone" desc="" exp=""/>
-        <constraint field="captain_email" desc="" exp=""/>
-        <constraint field="days" desc="" exp=""/>
-        <constraint field="races" desc="" exp=""/>
-        <constraint field="first_runner" desc="" exp=""/>
-        <constraint field="last_runner" desc="" exp=""/>
-        <constraint field="instructions" desc="" exp=""/>
+        <constraint desc="" exp="" field="position"/>
+        <constraint desc="" exp="" field="club"/>
+        <constraint desc="" exp="" field="firstname"/>
+        <constraint desc="" exp="" field="surname"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="phone"/>
+        <constraint desc="" exp="" field="email"/>
+        <constraint desc="" exp="" field="captain"/>
+        <constraint desc="" exp="" field="captain_phone"/>
+        <constraint desc="" exp="" field="captain_email"/>
+        <constraint desc="" exp="" field="days"/>
+        <constraint desc="" exp="" field="races"/>
+        <constraint desc="" exp="" field="first_runner"/>
+        <constraint desc="" exp="" field="last_runner"/>
+        <constraint desc="" exp="" field="instructions"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="position" type="field"/>
-          <column width="221" hidden="0" name="name" type="field"/>
-          <column width="-1" hidden="0" name="club" type="field"/>
-          <column width="-1" hidden="0" name="phone" type="field"/>
-          <column width="-1" hidden="0" name="email" type="field"/>
-          <column width="-1" hidden="0" name="captain" type="field"/>
-          <column width="-1" hidden="0" name="races" type="field"/>
+          <column width="-1" hidden="0" type="field" name="position"/>
+          <column width="221" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="club"/>
+          <column width="-1" hidden="0" type="field" name="phone"/>
+          <column width="-1" hidden="0" type="field" name="email"/>
+          <column width="-1" hidden="0" type="field" name="captain"/>
+          <column width="-1" hidden="0" type="field" name="races"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="first_runner" type="field"/>
-          <column width="-1" hidden="0" name="last_runner" type="field"/>
-          <column width="-1" hidden="0" name="instructions" type="field"/>
-          <column width="-1" hidden="0" name="firstname" type="field"/>
-          <column width="-1" hidden="0" name="surname" type="field"/>
-          <column width="-1" hidden="0" name="captain_phone" type="field"/>
-          <column width="-1" hidden="0" name="captain_email" type="field"/>
+          <column width="-1" hidden="0" type="field" name="first_runner"/>
+          <column width="-1" hidden="0" type="field" name="last_runner"/>
+          <column width="-1" hidden="0" type="field" name="instructions"/>
+          <column width="-1" hidden="0" type="field" name="firstname"/>
+          <column width="-1" hidden="0" type="field" name="surname"/>
+          <column width="-1" hidden="0" type="field" name="captain_phone"/>
+          <column width="-1" hidden="0" type="field" name="captain_email"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16828,23 +17600,23 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="tshirt"/>
       </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_number" labelOnTop="0"/>
-        <field name="club" labelOnTop="0"/>
-        <field name="email" labelOnTop="0"/>
-        <field name="first_name" labelOnTop="0"/>
-        <field name="first_runner" 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="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_number"/>
+        <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="email"/>
+        <field labelOnTop="0" name="first_name"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <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="tshirt"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16852,7 +17624,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -16917,7 +17689,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16942,58 +17714,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="141,90,153,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="141,90,153,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17024,36 +17796,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="141,90,153,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="101,64,109,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="141,90,153,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="101,64,109,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="141,90,153,255" k="color"/>
@@ -17068,44 +17840,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="141,90,153,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="101,64,109,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="141,90,153,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="101,64,109,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -17128,58 +17900,58 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
           <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
           <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="123,211,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="1" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="123,211,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17210,50 +17982,50 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="flat" type="QString"/>
-                <Option name="customdash" value="4;1;1;1" 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="103,34,144,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="1.25" 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="1" type="QString"/>
-                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="4;1;1;1" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1.25" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -17284,30 +18056,30 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -17327,33 +18099,33 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="5" 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 value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -17369,32 +18141,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@1@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@1@1@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="103,34,144,255" type="QString"/>
-                        <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -17409,9 +18181,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -17424,60 +18196,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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" value="id" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -17508,9 +18280,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17518,12 +18290,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -17534,14 +18306,14 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -17550,30 +18322,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17609,8 +18381,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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/>
@@ -17618,7 +18390,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -17683,7 +18455,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17708,58 +18480,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="232,113,141,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="232,113,141,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17790,36 +18562,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="232,113,141,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="166,81,101,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="232,113,141,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="166,81,101,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="232,113,141,255" k="color"/>
@@ -17834,44 +18606,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="232,113,141,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="166,81,101,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="232,113,141,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="166,81,101,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -17894,44 +18666,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="name" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8.5" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.75" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" fieldName="name" textOpacity="0.75" isExpression="0" namedStyle="Regular" fontSize="8.5" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1.5" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSize="1.5" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -17946,158 +18718,158 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelRotation" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
-                    <Option name="type" value="3" type="int"/>
+                <Option value="" type="QString" name="name"/>
+                <Option type="Map" name="properties">
+                  <Option type="Map" name="LabelRotation">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
-                  <Option name="PositionX" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="field" value="label_x" type="QString"/>
-                    <Option name="type" value="2" type="int"/>
+                  <Option type="Map" name="PositionX">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="label_x" type="QString" name="field"/>
+                    <Option value="2" type="int" name="type"/>
                   </Option>
-                  <Option name="PositionY" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="field" value="label_y" type="QString"/>
-                    <Option name="type" value="2" type="int"/>
+                  <Option type="Map" name="PositionY">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="label_y" type="QString" name="field"/>
+                    <Option value="2" type="int" name="type"/>
                   </Option>
-                  <Option name="Size" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString"/>
-                    <Option name="type" value="3" type="int"/>
+                  <Option type="Map" name="Size">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
                 </Option>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-          <placement priority="1" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="0.20000000000000001" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+          <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="1" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="0" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="2" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="PreventOverlap" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="0.20000000000000001" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="LabelRotation" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="LabelRotation">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="PositionX" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_x" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionX">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_x" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="PositionY" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_y" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionY">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_y" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Size">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-              <Option name="blendMode" value="0" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" value="" type="QString"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" value="false" type="bool"/>
-              <Option name="enabled" value="0" type="QString"/>
-              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-              <Option name="minLength" value="0" type="double"/>
-              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="minLengthUnit" value="MM" type="QString"/>
-              <Option name="offsetFromAnchor" value="0" type="double"/>
-              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-              <Option name="offsetFromLabel" value="0" type="double"/>
-              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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" value="&quot;name&quot;" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="&quot;name&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -18128,9 +18900,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18138,12 +18910,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -18154,157 +18926,157 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="osm_id" configurationFlags="None">
+        <field configurationFlags="None" name="osm_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="z_order" configurationFlags="None">
+        <field configurationFlags="None" name="z_order">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="population" configurationFlags="None">
+        <field configurationFlags="None" name="population">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_x" configurationFlags="None">
+        <field configurationFlags="None" name="label_x">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_y" configurationFlags="None">
+        <field configurationFlags="None" name="label_y">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_rota" configurationFlags="None">
+        <field configurationFlags="None" name="label_rota">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="osm_id"/>
+        <alias index="2" name="" field="name"/>
+        <alias index="3" name="" field="type"/>
+        <alias index="4" name="" field="z_order"/>
+        <alias index="5" name="" field="population"/>
+        <alias index="6" name="" field="label_x"/>
+        <alias index="7" name="" field="label_y"/>
+        <alias index="8" name="" field="label_rota"/>
       </aliases>
       <defaults>
-        <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=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="osm_id"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="z_order"/>
+        <default expression="" applyOnUpdate="0" field="population"/>
+        <default expression="" applyOnUpdate="0" field="label_x"/>
+        <default expression="" applyOnUpdate="0" field="label_y"/>
+        <default expression="" applyOnUpdate="0" field="label_rota"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="osm_id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="z_order" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="population" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label_x" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label_y" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label_rota" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="osm_id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="z_order"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="population"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rota"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="osm_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="z_order" desc="" exp=""/>
-        <constraint field="population" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rota" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="osm_id"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="z_order"/>
+        <constraint desc="" exp="" field="population"/>
+        <constraint desc="" exp="" field="label_x"/>
+        <constraint desc="" exp="" field="label_y"/>
+        <constraint desc="" exp="" field="label_rota"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="osm_id" type="field"/>
-          <column width="-1" hidden="0" name="name" type="field"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
-          <column width="-1" hidden="0" name="z_order" type="field"/>
-          <column width="-1" hidden="0" name="population" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="osm_id"/>
+          <column width="-1" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
+          <column width="-1" hidden="0" type="field" name="z_order"/>
+          <column width="-1" hidden="0" type="field" name="population"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="label_x" type="field"/>
-          <column width="-1" hidden="0" name="label_y" type="field"/>
-          <column width="-1" hidden="0" name="label_rota" type="field"/>
+          <column width="-1" hidden="0" type="field" name="label_x"/>
+          <column width="-1" hidden="0" type="field" name="label_y"/>
+          <column width="-1" hidden="0" type="field" name="label_rota"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18347,15 +19119,15 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="z_order"/>
       </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/>
@@ -18363,7 +19135,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -18428,7 +19200,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18453,58 +19225,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="255,158,23,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,158,23,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -18535,36 +19307,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,158,23,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="182,113,16,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,158,23,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="182,113,16,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,158,23,255" k="color"/>
@@ -18579,44 +19351,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="255,158,23,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="182,113,16,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="255,158,23,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="182,113,16,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -18639,52 +19411,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="7" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.80000000000000004" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" textOpacity="0.80000000000000004" isExpression="1" namedStyle="Regular" fontSize="7" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="196,60,57,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="196,60,57,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -18707,34 +19479,34 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -18749,107 +19521,107 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
-          <placement priority="3" geometryGeneratorEnabled="0" placement="3" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="4" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MapUnit" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="0.29999999999999999" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="5" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="0"/>
+          <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MapUnit" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="3" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="0" xOffset="0" offsetType="0" placement="3" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="4" layerType="LineGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="PreventOverlap" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="1" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="0.29999999999999999" minFeatureSize="5" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="AlwaysShow" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="always_sho" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="AlwaysShow">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="always_sho" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="IsObstacle" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="&quot;&quot;" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="IsObstacle">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="&quot;&quot;" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="LabelRotation" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="360 - (&quot;label_rota&quot;)" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="LabelRotation">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="PositionX" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_x" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionX">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_x" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="PositionY" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="label_y" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="PositionY">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_y" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="Priority" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="Priority">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
-                <Option name="Show" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="auxiliary_storage_labeling_show" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="Show">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="auxiliary_storage_labeling_show" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Size">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-              <Option name="blendMode" value="0" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" value="" type="QString"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" value="false" type="bool"/>
-              <Option name="enabled" value="0" type="QString"/>
-              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-              <Option name="minLength" value="0" type="double"/>
-              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="minLengthUnit" value="MM" type="QString"/>
-              <Option name="offsetFromAnchor" value="0" type="double"/>
-              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-              <Option name="offsetFromLabel" value="0" type="double"/>
-              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
@@ -18860,56 +19632,56 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -18940,9 +19712,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18950,12 +19722,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -18966,121 +19738,121 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="osm_id" configurationFlags="None">
+        <field configurationFlags="None" name="osm_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="highway" configurationFlags="None">
+        <field configurationFlags="None" name="highway">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="waterway" configurationFlags="None">
+        <field configurationFlags="None" name="waterway">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="aerialway" configurationFlags="None">
+        <field configurationFlags="None" name="aerialway">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="barrier" configurationFlags="None">
+        <field configurationFlags="None" name="barrier">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="man_made" configurationFlags="None">
+        <field configurationFlags="None" name="man_made">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="z_order" configurationFlags="None">
+        <field configurationFlags="None" name="z_order">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="other_tags" configurationFlags="None">
+        <field configurationFlags="None" name="other_tags">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="never_show" configurationFlags="None">
+        <field configurationFlags="None" name="never_show">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label_x" configurationFlags="None">
+        <field configurationFlags="None" name="label_x">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label_y" configurationFlags="None">
+        <field configurationFlags="None" name="label_y">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label_rota" configurationFlags="None">
+        <field configurationFlags="None" name="label_rota">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="always_sho" configurationFlags="None">
+        <field configurationFlags="None" name="always_sho">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="resident_a" configurationFlags="None">
+        <field configurationFlags="None" name="resident_a">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="auxiliary_storage_labeling_show" configurationFlags="None">
+        <field configurationFlags="None" name="auxiliary_storage_labeling_show">
           <editWidget type="Hidden">
             <config>
               <Option/>
@@ -19089,100 +19861,100 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias index="0" name="" field="osm_id"/>
+        <alias index="1" name="" field="name"/>
+        <alias index="2" name="" field="highway"/>
+        <alias index="3" name="" field="waterway"/>
+        <alias index="4" name="" field="aerialway"/>
+        <alias index="5" name="" field="barrier"/>
+        <alias index="6" name="" field="man_made"/>
+        <alias index="7" name="" field="z_order"/>
+        <alias index="8" name="" field="other_tags"/>
+        <alias index="9" name="" field="never_show"/>
+        <alias index="10" name="" field="label_x"/>
+        <alias index="11" name="" field="label_y"/>
+        <alias index="12" name="" field="label_rota"/>
+        <alias index="13" name="" field="always_sho"/>
+        <alias index="14" name="" field="resident_a"/>
+        <alias index="15" name="" field="auxiliary_storage_labeling_show"/>
       </aliases>
       <defaults>
-        <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=""/>
+        <default expression="" applyOnUpdate="0" field="osm_id"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="highway"/>
+        <default expression="" applyOnUpdate="0" field="waterway"/>
+        <default expression="" applyOnUpdate="0" field="aerialway"/>
+        <default expression="" applyOnUpdate="0" field="barrier"/>
+        <default expression="" applyOnUpdate="0" field="man_made"/>
+        <default expression="" applyOnUpdate="0" field="z_order"/>
+        <default expression="" applyOnUpdate="0" field="other_tags"/>
+        <default expression="" applyOnUpdate="0" field="never_show"/>
+        <default expression="" applyOnUpdate="0" field="label_x"/>
+        <default expression="" applyOnUpdate="0" field="label_y"/>
+        <default expression="" applyOnUpdate="0" field="label_rota"/>
+        <default expression="" applyOnUpdate="0" field="always_sho"/>
+        <default expression="" applyOnUpdate="0" field="resident_a"/>
+        <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_show"/>
       </defaults>
       <constraints>
-        <constraint field="osm_id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="highway" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="waterway" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="aerialway" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="barrier" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="man_made" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="z_order" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="other_tags" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="never_show" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label_x" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label_y" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label_rota" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="always_sho" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="resident_a" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="auxiliary_storage_labeling_show" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="osm_id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="highway"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="waterway"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="aerialway"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="barrier"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="man_made"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="z_order"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="other_tags"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="never_show"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_x"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_y"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label_rota"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="always_sho"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="resident_a"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_show"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="osm_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="highway" desc="" exp=""/>
-        <constraint field="waterway" desc="" exp=""/>
-        <constraint field="aerialway" desc="" exp=""/>
-        <constraint field="barrier" desc="" exp=""/>
-        <constraint field="man_made" desc="" exp=""/>
-        <constraint field="z_order" desc="" exp=""/>
-        <constraint field="other_tags" desc="" exp=""/>
-        <constraint field="never_show" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rota" desc="" exp=""/>
-        <constraint field="always_sho" desc="" exp=""/>
-        <constraint field="resident_a" desc="" exp=""/>
-        <constraint field="auxiliary_storage_labeling_show" desc="" exp=""/>
+        <constraint desc="" exp="" field="osm_id"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="highway"/>
+        <constraint desc="" exp="" field="waterway"/>
+        <constraint desc="" exp="" field="aerialway"/>
+        <constraint desc="" exp="" field="barrier"/>
+        <constraint desc="" exp="" field="man_made"/>
+        <constraint desc="" exp="" field="z_order"/>
+        <constraint desc="" exp="" field="other_tags"/>
+        <constraint desc="" exp="" field="never_show"/>
+        <constraint desc="" exp="" field="label_x"/>
+        <constraint desc="" exp="" field="label_y"/>
+        <constraint desc="" exp="" field="label_rota"/>
+        <constraint desc="" exp="" field="always_sho"/>
+        <constraint desc="" exp="" field="resident_a"/>
+        <constraint desc="" exp="" field="auxiliary_storage_labeling_show"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;">
         <columns>
-          <column width="-1" hidden="0" name="osm_id" type="field"/>
-          <column width="160" hidden="0" name="name" type="field"/>
-          <column width="-1" hidden="0" name="z_order" type="field"/>
+          <column width="-1" hidden="0" type="field" name="osm_id"/>
+          <column width="160" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="z_order"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="highway" type="field"/>
-          <column width="-1" hidden="0" name="waterway" type="field"/>
-          <column width="-1" hidden="0" name="aerialway" type="field"/>
-          <column width="-1" hidden="0" name="barrier" type="field"/>
-          <column width="-1" hidden="0" name="man_made" type="field"/>
-          <column width="142" hidden="0" name="other_tags" type="field"/>
-          <column width="-1" hidden="0" name="never_show" type="field"/>
-          <column width="-1" hidden="0" name="label_x" type="field"/>
-          <column width="-1" hidden="0" name="label_y" type="field"/>
-          <column width="-1" hidden="0" name="label_rota" type="field"/>
-          <column width="-1" hidden="0" name="always_sho" type="field"/>
-          <column width="-1" hidden="0" name="resident_a" type="field"/>
-          <column width="-1" hidden="0" name="auxiliary_storage_labeling_show" type="field"/>
+          <column width="-1" hidden="0" type="field" name="highway"/>
+          <column width="-1" hidden="0" type="field" name="waterway"/>
+          <column width="-1" hidden="0" type="field" name="aerialway"/>
+          <column width="-1" hidden="0" type="field" name="barrier"/>
+          <column width="-1" hidden="0" type="field" name="man_made"/>
+          <column width="142" hidden="0" type="field" name="other_tags"/>
+          <column width="-1" hidden="0" type="field" name="never_show"/>
+          <column width="-1" hidden="0" type="field" name="label_x"/>
+          <column width="-1" hidden="0" type="field" name="label_y"/>
+          <column width="-1" hidden="0" type="field" name="label_rota"/>
+          <column width="-1" hidden="0" type="field" name="always_sho"/>
+          <column width="-1" hidden="0" type="field" name="resident_a"/>
+          <column width="-1" hidden="0" type="field" name="auxiliary_storage_labeling_show"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19250,58 +20022,58 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="z_order"/>
       </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>
@@ -19351,7 +20123,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -19416,7 +20188,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19441,58 +20213,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="231,113,72,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="231,113,72,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -19523,36 +20295,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="231,113,72,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="165,81,51,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="231,113,72,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="165,81,51,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="231,113,72,255" k="color"/>
@@ -19567,44 +20339,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="231,113,72,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="165,81,51,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="231,113,72,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="165,81,51,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -19627,16 +20399,16 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
           <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
           <rule filter="&quot;type&quot; = 'toilets'" symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
@@ -19646,35 +20418,35 @@ def my_form_open(dialog, layer, feature):
           <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="0,0,0,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="round" type="QString"/>
-                <Option name="name" value="star" 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="0,0,0,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.5" 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="7" 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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="star" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.5" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="7" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -19697,47 +20469,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '14', '7' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="color" value="0,32,80,255" type="QString"/>
-                <Option name="fixedAspectRatio" value="0" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="name" value="amenity/amenity_toilets.svg" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_width" value="0" 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 value="0" type="QString" name="angle"/>
+                <Option value="0,32,80,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="amenity/amenity_toilets.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" value="diameter" type="QString"/>
-                <Option name="size" value="7" 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 value="diameter" type="QString" name="scale_method"/>
+                <Option value="7" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,32,80,255" k="color"/>
@@ -19759,47 +20531,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="2" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="color" value="0,0,0,255" type="QString"/>
-                <Option name="fixedAspectRatio" value="0" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="name" value="../images/gym-bag.svg" 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="0,0,0,255" 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 value="0" type="QString" name="angle"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="../images/gym-bag.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" value="diameter" type="QString"/>
-                <Option name="size" value="6" 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 value="diameter" type="QString" name="scale_method"/>
+                <Option value="6" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
@@ -19821,57 +20593,57 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="fillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="3" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="color" value="125,139,143,255" type="QString"/>
-                <Option name="fixedAspectRatio" value="0" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="name" value="../images/road_closure.svg" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_width" value="0" 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 value="0" type="QString" name="angle"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="../images/road_closure.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" value="diameter" type="QString"/>
-                <Option name="size" value="6" 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 value="diameter" type="QString" name="scale_method"/>
+                <Option value="6" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="125,139,143,255" k="color"/>
@@ -19893,47 +20665,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '6' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="4" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="color" value="0,12,254,255" type="QString"/>
-                <Option name="fixedAspectRatio" value="0" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="name" value="transport/transport_bus_stop.svg" 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="255,255,255,255" type="QString"/>
-                <Option name="outline_width" value="0" 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 value="0" type="QString" name="angle"/>
+                <Option value="0,12,254,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="transport/transport_bus_stop.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="255,255,255,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" value="diameter" type="QString"/>
-                <Option name="size" value="5" 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 value="diameter" type="QString" name="scale_method"/>
+                <Option value="5" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,12,254,255" k="color"/>
@@ -19956,18 +20728,18 @@ def my_form_open(dialog, layer, feature):
               <effect enabled="0" type="effectStack">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option name="blend_mode" value="13" type="QString"/>
-                    <Option name="blur_level" value="2.645" type="QString"/>
-                    <Option name="blur_unit" value="MM" type="QString"/>
-                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="draw_mode" value="2" type="QString"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="offset_angle" value="135" type="QString"/>
-                    <Option name="offset_distance" value="2" type="QString"/>
-                    <Option name="offset_unit" value="MM" type="QString"/>
-                    <Option name="offset_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="opacity" value="1" type="QString"/>
+                    <Option value="13" type="QString" name="blend_mode"/>
+                    <Option value="2.645" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="135" type="QString" name="offset_angle"/>
+                    <Option value="2" type="QString" name="offset_distance"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
+                    <Option value="1" type="QString" name="opacity"/>
                   </Option>
                   <prop v="13" k="blend_mode"/>
                   <prop v="2.645" k="blur_level"/>
@@ -19984,24 +20756,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option name="blend_mode" value="0" type="QString"/>
-                    <Option name="blur_level" value="0.7935" type="QString"/>
-                    <Option name="blur_unit" value="MM" type="QString"/>
-                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color1" value="0,0,255,255" type="QString"/>
-                    <Option name="color2" value="0,255,0,255" type="QString"/>
-                    <Option name="color_type" value="0" type="QString"/>
-                    <Option name="direction" value="ccw" type="QString"/>
-                    <Option name="discrete" value="0" type="QString"/>
-                    <Option name="draw_mode" value="2" type="QString"/>
-                    <Option name="enabled" value="1" type="QString"/>
-                    <Option name="opacity" value="0.5" type="QString"/>
-                    <Option name="rampType" value="gradient" type="QString"/>
-                    <Option name="single_color" value="255,255,255,255" type="QString"/>
-                    <Option name="spec" value="rgb" type="QString"/>
-                    <Option name="spread" value="2" type="QString"/>
-                    <Option name="spread_unit" value="MM" type="QString"/>
-                    <Option name="spread_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option value="0" type="QString" name="blend_mode"/>
+                    <Option value="0.7935" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,255,255" type="QString" name="color1"/>
+                    <Option value="0,255,0,255" type="QString" name="color2"/>
+                    <Option value="0" type="QString" name="color_type"/>
+                    <Option value="ccw" type="QString" name="direction"/>
+                    <Option value="0" type="QString" name="discrete"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="1" type="QString" name="enabled"/>
+                    <Option value="0.5" type="QString" name="opacity"/>
+                    <Option value="gradient" type="QString" name="rampType"/>
+                    <Option value="255,255,255,255" type="QString" name="single_color"/>
+                    <Option value="rgb" type="QString" name="spec"/>
+                    <Option value="2" type="QString" name="spread"/>
+                    <Option value="MM" type="QString" name="spread_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="0.7935" k="blur_level"/>
@@ -20024,10 +20796,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option name="blend_mode" value="0" type="QString"/>
-                    <Option name="draw_mode" value="2" type="QString"/>
-                    <Option name="enabled" value="1" type="QString"/>
-                    <Option name="opacity" value="1" type="QString"/>
+                    <Option value="0" type="QString" name="blend_mode"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="1" type="QString" name="enabled"/>
+                    <Option value="1" type="QString" name="opacity"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="2" k="draw_mode"/>
@@ -20036,18 +20808,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option name="blend_mode" value="13" type="QString"/>
-                    <Option name="blur_level" value="2.645" type="QString"/>
-                    <Option name="blur_unit" value="MM" type="QString"/>
-                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="0,0,0,255" type="QString"/>
-                    <Option name="draw_mode" value="2" type="QString"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="offset_angle" value="135" type="QString"/>
-                    <Option name="offset_distance" value="2" type="QString"/>
-                    <Option name="offset_unit" value="MM" type="QString"/>
-                    <Option name="offset_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="opacity" value="1" type="QString"/>
+                    <Option value="13" type="QString" name="blend_mode"/>
+                    <Option value="2.645" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="135" type="QString" name="offset_angle"/>
+                    <Option value="2" type="QString" name="offset_distance"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
+                    <Option value="1" type="QString" name="opacity"/>
                   </Option>
                   <prop v="13" k="blend_mode"/>
                   <prop v="2.645" k="blur_level"/>
@@ -20064,24 +20836,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option name="blend_mode" value="0" type="QString"/>
-                    <Option name="blur_level" value="0.7935" type="QString"/>
-                    <Option name="blur_unit" value="MM" type="QString"/>
-                    <Option name="blur_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color1" value="0,0,255,255" type="QString"/>
-                    <Option name="color2" value="0,255,0,255" type="QString"/>
-                    <Option name="color_type" value="0" type="QString"/>
-                    <Option name="direction" value="ccw" type="QString"/>
-                    <Option name="discrete" value="0" type="QString"/>
-                    <Option name="draw_mode" value="2" type="QString"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="opacity" value="0.5" type="QString"/>
-                    <Option name="rampType" value="gradient" type="QString"/>
-                    <Option name="single_color" value="255,255,255,255" type="QString"/>
-                    <Option name="spec" value="rgb" type="QString"/>
-                    <Option name="spread" value="2" type="QString"/>
-                    <Option name="spread_unit" value="MM" type="QString"/>
-                    <Option name="spread_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option value="0" type="QString" name="blend_mode"/>
+                    <Option value="0.7935" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,255,255" type="QString" name="color1"/>
+                    <Option value="0,255,0,255" type="QString" name="color2"/>
+                    <Option value="0" type="QString" name="color_type"/>
+                    <Option value="ccw" type="QString" name="direction"/>
+                    <Option value="0" type="QString" name="discrete"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="0.5" type="QString" name="opacity"/>
+                    <Option value="gradient" type="QString" name="rampType"/>
+                    <Option value="255,255,255,255" type="QString" name="single_color"/>
+                    <Option value="rgb" type="QString" name="spec"/>
+                    <Option value="2" type="QString" name="spread"/>
+                    <Option value="MM" type="QString" name="spread_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="0.7935" k="blur_level"/>
@@ -20105,47 +20877,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="5" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="5" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SvgMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="color" value="43,153,41,255" type="QString"/>
-                <Option name="fixedAspectRatio" value="0" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="name" value="transport/amenity=parking.svg" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_width" value="0" 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 value="0" type="QString" name="angle"/>
+                <Option value="43,153,41,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="transport/amenity=parking.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" value="diameter" type="QString"/>
-                <Option name="size" value="6" 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 value="diameter" type="QString" name="scale_method"/>
+                <Option value="6" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="43,153,41,255" k="color"/>
@@ -20167,15 +20939,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="expression" value="if( @map_scale &lt; 7000, '10', '5' )" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20184,32 +20956,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="name" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="63" fieldName="name" textOpacity="0.90000000000000002" isExpression="0" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.80000000000000004" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="2" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="1" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="2" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.69999999999999996" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="2" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferSize="2" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="2" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="0.69999999999999996" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="1">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -20224,148 +20996,148 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelDistance" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="expression" value="if( @map_scale &lt; 7000, '5', '3' )" type="QString"/>
-                    <Option name="type" value="3" type="int"/>
+                <Option value="" type="QString" name="name"/>
+                <Option type="Map" name="properties">
+                  <Option type="Map" name="LabelDistance">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
-                  <Option name="OffsetQuad" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="expression" value="2" type="QString"/>
-                    <Option name="type" value="3" type="int"/>
+                  <Option type="Map" name="OffsetQuad">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="2" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
-                  <Option name="Size" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="expression" value="if( @map_scale &lt; 7000, '14', '10' )" type="QString"/>
-                    <Option name="type" value="3" type="int"/>
+                  <Option type="Map" name="Size">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
                 </Option>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-          <placement priority="10" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="2" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="3" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="2" dist="3" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="10" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+          <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="2" offsetType="0" placement="0" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="3" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="2" offsetUnits="MM" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="3" geometryGeneratorType="PointGeometry"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1.8" minFeatureSize="0" upsidedownLabels="0" zIndex="10" fontLimitPixelSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="LabelDistance" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="if( @map_scale &lt; 7000, '5', '3' )" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="LabelDistance">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="OffsetQuad" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="2" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="OffsetQuad">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="2" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="if( @map_scale &lt; 7000, '14', '10' )" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="Size">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-              <Option name="blendMode" value="0" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" value="" type="QString"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" value="false" type="bool"/>
-              <Option name="enabled" value="0" type="QString"/>
-              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-              <Option name="minLength" value="0" type="double"/>
-              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="minLengthUnit" value="MM" type="QString"/>
-              <Option name="offsetFromAnchor" value="0" type="double"/>
-              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-              <Option name="offsetFromLabel" value="0" type="double"/>
-              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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" value="id" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -20396,9 +21168,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20406,12 +21178,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -20422,28 +21194,28 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -20452,40 +21224,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="name"/>
+        <alias index="3" name="" field="distance"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="distance"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="name" type="field"/>
-          <column width="-1" hidden="0" name="distance" type="field"/>
+          <column width="-1" hidden="0" type="field" name="name"/>
+          <column width="-1" hidden="0" type="field" name="distance"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20523,10 +21295,10 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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/>
@@ -20534,7 +21306,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -20607,58 +21379,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="152,125,183,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="152,125,183,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -20689,36 +21461,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="152,125,183,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="109,89,131,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="152,125,183,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="109,89,131,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="152,125,183,255" k="color"/>
@@ -20733,44 +21505,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="152,125,183,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="109,89,131,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="152,125,183,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="109,89,131,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -20793,42 +21565,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="LinePatternFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="LinePatternFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="135" type="QString"/>
-                <Option name="clip_mode" value="during_render" type="QString"/>
-                <Option name="color" value="211,134,33,255" type="QString"/>
-                <Option name="coordinate_reference" value="feature" type="QString"/>
-                <Option name="distance" value="2" type="QString"/>
-                <Option name="distance_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="distance_unit" value="MM" type="QString"/>
-                <Option name="line_width" value="0.26" type="QString"/>
-                <Option name="line_width_map_unit_scale" value="3x:0,0,0,0,0,0" 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="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 value="135" type="QString" name="angle"/>
+                <Option value="during_render" type="QString" name="clip_mode"/>
+                <Option value="211,134,33,255" type="QString" name="color"/>
+                <Option value="feature" type="QString" name="coordinate_reference"/>
+                <Option value="2" type="QString" name="distance"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="distance_map_unit_scale"/>
+                <Option value="MM" type="QString" name="distance_unit"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="line_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
               </Option>
               <prop v="135" k="angle"/>
               <prop v="during_render" k="clip_mode"/>
@@ -20847,48 +21619,48 @@ def my_form_open(dialog, layer, feature):
               <prop v="MM" k="outline_width_unit"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="@0@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                   <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="211,134,33,255" type="QString"/>
-                    <Option name="line_style" value="solid" type="QString"/>
-                    <Option name="line_width" value="0.3" 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 value="0" type="QString" name="align_dash_pattern"/>
+                    <Option value="square" type="QString" name="capstyle"/>
+                    <Option value="5;2" type="QString" name="customdash"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="customdash_unit"/>
+                    <Option value="0" type="QString" name="dash_pattern_offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                    <Option value="0" type="QString" name="draw_inside_polygon"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="211,134,33,255" type="QString" name="line_color"/>
+                    <Option value="solid" type="QString" name="line_style"/>
+                    <Option value="0.3" type="QString" name="line_width"/>
+                    <Option value="MM" type="QString" name="line_width_unit"/>
+                    <Option value="0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0" type="QString" name="ring_filter"/>
+                    <Option value="0" type="QString" name="trim_distance_end"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                    <Option value="0" type="QString" name="trim_distance_start"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                    <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                    <Option value="0" type="QString" name="use_custom_dash"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                   </Option>
                   <prop v="0" k="align_dash_pattern"/>
                   <prop v="square" k="capstyle"/>
@@ -20919,27 +21691,27 @@ 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 value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="211,134,33,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="0,0,0,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.46" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="no" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="211,134,33,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.46" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="no" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="211,134,33,255" k="color"/>
@@ -20954,9 +21726,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20967,60 +21739,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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" value="id" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -21051,9 +21823,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21061,12 +21833,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="1" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="1" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -21077,7 +21849,7 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="FID" configurationFlags="None">
+        <field configurationFlags="None" name="FID">
           <editWidget type="">
             <config>
               <Option/>
@@ -21086,25 +21858,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias index="0" name="" field="FID"/>
       </aliases>
       <defaults>
-        <default field="FID" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="FID"/>
       </defaults>
       <constraints>
-        <constraint field="FID" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="FID"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" desc="" exp=""/>
+        <constraint desc="" exp="" field="FID"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="431" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="431" hidden="0" type="field" name="type"/>
           <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
@@ -21141,8 +21913,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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/>
@@ -21150,7 +21922,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -21215,7 +21987,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21240,58 +22012,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="190,207,80,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="190,207,80,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21322,36 +22094,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="190,207,80,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="136,148,57,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="190,207,80,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,148,57,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,207,80,255" k="color"/>
@@ -21366,44 +22138,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="190,207,80,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="136,148,57,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="190,207,80,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,148,57,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -21426,16 +22198,16 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
           <rule filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
           <rule filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
@@ -21444,43 +22216,43 @@ def my_form_open(dialog, layer, feature):
           <rule filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="0,255,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.75" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,255,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21511,50 +22283,50 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="2" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="2" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -21574,40 +22346,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@0" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="255,255,255,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="circle" 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="0,255,0,255" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0.5" 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="1" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,255,0,255" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0.5" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="1" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -21630,52 +22402,52 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="2" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="square" type="QString"/>
-                <Option name="customdash" value="2;1;1;1" 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="0,255,0,255" type="QString"/>
-                <Option name="line_style" value="dash dot dot" type="QString"/>
-                <Option name="line_width" value="0.75" 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="1" type="QString"/>
-                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="2;1;1;1" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,255,0,255" type="QString" name="line_color"/>
+                <Option value="dash dot dot" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21706,41 +22478,41 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="250" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MapUnit" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="25" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MapUnit" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="25" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -21760,46 +22532,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="enabled">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@2@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@2@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,255,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="35,35,35,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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.5" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,255,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3.5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -21822,58 +22594,58 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="outlineStyle">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="3" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="square" type="QString"/>
-                <Option name="customdash" value="3;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="0,255,0,255" type="QString"/>
-                <Option name="line_style" value="dash" type="QString"/>
-                <Option name="line_width" value="0.75" 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="1" type="QString"/>
-                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="3;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,255,0,255" type="QString" name="line_color"/>
+                <Option value="dash" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21904,41 +22676,41 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="250" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MapUnit" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="25" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MapUnit" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="Interval" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="25" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -21958,46 +22730,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="enabled">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@3@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@3@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="cap_style" value="square" type="QString"/>
-                    <Option name="color" value="0,255,0,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="joinstyle" value="bevel" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="35,35,35,0" type="QString"/>
-                    <Option name="outline_style" value="solid" type="QString"/>
-                    <Option name="outline_width" value="0" 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.5" 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 value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,255,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3.5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -22020,58 +22792,58 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="outlineStyle">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="4" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="255,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.75" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22102,20 +22874,20 @@ 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 name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22124,32 +22896,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="times" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="9" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" fieldName="times" textOpacity="1" isExpression="0" namedStyle="Regular" fontSize="9" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -22164,116 +22936,116 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="4294967295"/>
-          <placement priority="5" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="4294967295"/>
+          <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="0" xOffset="0" offsetType="0" placement="2" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="PreventOverlap" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-              <Option name="blendMode" value="0" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" value="" type="QString"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" value="false" type="bool"/>
-              <Option name="enabled" value="0" type="QString"/>
-              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-              <Option name="minLength" value="0" type="double"/>
-              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="minLengthUnit" value="MM" type="QString"/>
-              <Option name="offsetFromAnchor" value="0" type="double"/>
-              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-              <Option name="offsetFromLabel" value="0" type="double"/>
-              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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" value="id" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -22304,9 +23076,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22314,12 +23086,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -22330,28 +23102,28 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="status" configurationFlags="None">
+        <field configurationFlags="None" name="status">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="times" configurationFlags="None">
+        <field configurationFlags="None" name="times">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -22360,40 +23132,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="status"/>
+        <alias index="3" name="" field="times"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
-        <default field="times" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="status"/>
+        <default expression="" applyOnUpdate="0" field="times"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="status" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="times" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="status"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="times"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
-        <constraint field="times" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="status"/>
+        <constraint desc="" exp="" field="times"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="202" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="202" hidden="0" type="field" name="type"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="status" type="field"/>
-          <column width="-1" hidden="0" name="times" type="field"/>
+          <column width="-1" hidden="0" type="field" name="status"/>
+          <column width="-1" hidden="0" type="field" name="times"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22431,10 +23203,10 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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/>
@@ -22442,7 +23214,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37569522835420344</xmin>
         <ymin>-33.95582126985814853</ymin>
@@ -22507,7 +23279,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -22532,58 +23304,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="225,89,137,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="225,89,137,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22614,36 +23386,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="225,89,137,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="161,64,98,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="161,64,98,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -22658,44 +23430,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="225,89,137,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="161,64,98,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="161,64,98,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -22718,54 +23490,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
       <labeling type="rule-based">
-        <rules key="{d63c5432-5520-43ac-b983-fd469230b197}">
-          <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="{24a5df7c-cc81-475f-8d69-986aab397721}">
+        <rules key="{0a67d1c6-0289-43d0-8cea-e94d16054c5d}">
+          <rule description="Active routes" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{c7589943-f7c2-4796-a405-6a8c9e18ff15}">
             <settings calloutType="simple">
-              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="213,180,60,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="213,180,60,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -22788,34 +23560,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,0,0,255" type="QString"/>
-                        <Option name="joinstyle" value="round" 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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="1" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,0,0,255" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -22830,138 +23602,138 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                            <Option type="Map" name="outlineColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="3" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <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="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="field" value="quadrant" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="quadrant" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="field" value="rotation" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="rotation" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" active="0" description="Show by day" key="{bf78850a-9784-4133-a14f-0af30e9c2f70}">
+          <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1a82228c-f408-4c3d-bb8d-158713c47604}">
             <settings calloutType="simple">
-              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="213,180,60,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="213,180,60,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -22984,34 +23756,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="0,0,0,255" type="QString"/>
-                        <Option name="joinstyle" value="round" 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="0,0,0,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="1" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,0,0,255" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -23026,131 +23798,131 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                          <Option value="" type="QString" name="name"/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" value="true" type="bool"/>
-                              <Option 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" type="QString"/>
-                              <Option name="type" value="3" type="int"/>
+                            <Option type="Map" name="outlineColor">
+                              <Option value="true" type="bool" name="active"/>
+                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                              <Option value="3" type="int" name="type"/>
                             </Option>
                           </Option>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="3" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
               <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="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option name="field" value="quadrant" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="quadrant" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="field" value="rotation" type="QString"/>
-                      <Option name="type" value="2" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="rotation" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" description="List for legends" key="{e726e3ba-accf-434a-8ffa-dceae4642f95}">
-            <rule filter="&quot;Source&quot; = '21KM'" active="0" description="21KM" key="{a640a5b0-35c2-4ff6-9023-5e825ddbe7be}">
+          <rule description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}">
+            <rule description="21KM" filter="&quot;Source&quot; = '21KM'" active="0" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}">
               <settings calloutType="simple">
-                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+                <text-style fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="210,32,39,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                  <background shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="128" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                    <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                          <Option name="color" value="210,32,39,255" type="QString"/>
-                          <Option name="joinstyle" value="round" 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="210,32,39,255" type="QString"/>
-                          <Option name="outline_style" value="solid" type="QString"/>
-                          <Option name="outline_width" value="1" type="QString"/>
-                          <Option name="outline_width_unit" value="MM" type="QString"/>
-                          <Option name="style" value="solid" type="QString"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="210,32,39,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="210,32,39,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="210,32,39,255" k="color"/>
@@ -23165,130 +23937,130 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" value="" type="QString"/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" value="collection" type="QString"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="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="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                        <Option type="Map" name="PositionY">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option name="field" value="quadrant" type="QString"/>
-                          <Option name="type" value="2" type="int"/>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="quadrant" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="field" value="rotation" type="QString"/>
-                          <Option name="type" value="2" type="int"/>
+                        <Option type="Map" name="Rotation">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="rotation" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+                <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="3" offsetUnits="MapUnit" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
                 <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="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                    <Option name="blendMode" value="0" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" value="" type="QString"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" value="false" type="bool"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                    <Option name="minLength" value="0" type="double"/>
-                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="minLengthUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromAnchor" value="0" type="double"/>
-                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromLabel" value="0" type="double"/>
-                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" active="0" description="10KM" key="{aa14f8a1-c725-4fd0-ab45-a85ddb7a4401}">
+            <rule description="10KM" filter="&quot;Source&quot; = '10KM'" active="0" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}">
               <settings calloutType="simple">
-                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+                <text-style fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="103,34,144,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                  <background shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="128" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                    <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                          <Option name="color" value="103,34,144,255" type="QString"/>
-                          <Option name="joinstyle" value="round" 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="103,34,144,255" type="QString"/>
-                          <Option name="outline_style" value="solid" type="QString"/>
-                          <Option name="outline_width" value="1" type="QString"/>
-                          <Option name="outline_width_unit" value="MM" type="QString"/>
-                          <Option name="style" value="solid" type="QString"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="103,34,144,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="103,34,144,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="103,34,144,255" k="color"/>
@@ -23303,130 +24075,130 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" value="" type="QString"/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" value="collection" type="QString"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="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="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                        <Option type="Map" name="PositionY">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option name="field" value="quadrant" type="QString"/>
-                          <Option name="type" value="2" type="int"/>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="quadrant" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="field" value="rotation" type="QString"/>
-                          <Option name="type" value="2" type="int"/>
+                        <Option type="Map" name="Rotation">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="rotation" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+                <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
                 <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="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                    <Option name="blendMode" value="0" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" value="" type="QString"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" value="false" type="bool"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                    <Option name="minLength" value="0" type="double"/>
-                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="minLengthUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromAnchor" value="0" type="double"/>
-                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromLabel" value="0" type="double"/>
-                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" active="0" description="5KM" key="{9fb8f756-122b-4772-a202-d4f6e472edf2}">
+            <rule description="5KM" filter="&quot;Source&quot; = '5KM'" active="0" key="{693188a6-ae99-4fd2-859f-1606793dda66}">
               <settings calloutType="simple">
-                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+                <text-style fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                  <background shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="128" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                    <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                          <Option name="color" value="145,211,55,255" type="QString"/>
-                          <Option name="joinstyle" value="round" 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="145,211,55,255" type="QString"/>
-                          <Option name="outline_style" value="solid" type="QString"/>
-                          <Option name="outline_width" value="1" type="QString"/>
-                          <Option name="outline_width_unit" value="MM" type="QString"/>
-                          <Option name="style" value="solid" type="QString"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="145,211,55,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="145,211,55,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="145,211,55,255" k="color"/>
@@ -23441,138 +24213,138 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" value="" type="QString"/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" value="collection" type="QString"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="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="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="type" value="1" type="int"/>
-                          <Option name="val" value="" type="QString"/>
+                        <Option type="Map" name="PositionY">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" value="true" type="bool"/>
-                          <Option name="field" value="quadrant" type="QString"/>
-                          <Option name="type" value="2" type="int"/>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="quadrant" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" value="false" type="bool"/>
-                          <Option name="field" value="rotation" type="QString"/>
-                          <Option name="type" value="2" type="int"/>
+                        <Option type="Map" name="Rotation">
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="rotation" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+                <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
                 <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="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                    <Option name="blendMode" value="0" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" value="" type="QString"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" value="false" type="bool"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                    <Option name="minLength" value="0" type="double"/>
-                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="minLengthUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromAnchor" value="0" type="double"/>
-                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromLabel" value="0" type="double"/>
-                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = 'Trail'" active="0" description="Trail" key="{5aa6b2d0-7089-489a-9176-ba78eb19ffde}">
+            <rule description="Trail" filter="&quot;Source&quot; = 'Trail'" active="0" key="{ba58e108-c24a-410e-9584-a7819af049ef}">
               <settings calloutType="simple">
-                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
+                <text-style fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOpacity="1" isExpression="1" namedStyle="Semibold" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
-                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
-                    <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                  <background shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeRadiiY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="1" shapeRotationType="0" shapeSizeY="0">
+                    <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                      <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                         <Option type="Map">
-                          <Option name="angle" value="0" type="QString"/>
-                          <Option name="cap_style" value="square" type="QString"/>
-                          <Option name="color" value="133,182,111,255" type="QString"/>
-                          <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                          <Option name="joinstyle" value="bevel" type="QString"/>
-                          <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                          <Option name="outline_style" value="solid" type="QString"/>
-                          <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                          <Option value="square" type="QString" name="cap_style"/>
+                          <Option value="133,182,111,255" type="QString" name="color"/>
+                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                          <Option value="bevel" type="QString" name="joinstyle"/>
+                          <Option value="circle" type="QString" name="name"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="0" type="QString" name="outline_width"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="diameter" type="QString" name="scale_method"/>
+                          <Option value="2" type="QString" name="size"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="size_unit"/>
+                          <Option value="1" type="QString" name="vertical_anchor_point"/>
                         </Option>
                         <prop v="0" k="angle"/>
                         <prop v="square" k="cap_style"/>
@@ -23595,34 +24367,34 @@ def my_form_open(dialog, layer, feature):
                         <prop v="1" k="vertical_anchor_point"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" value="" type="QString"/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" value="collection" type="QString"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                    <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                          <Option name="color" value="0,72,255,255" type="QString"/>
-                          <Option name="joinstyle" value="round" 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="0,72,255,255" type="QString"/>
-                          <Option name="outline_style" value="solid" type="QString"/>
-                          <Option name="outline_width" value="1" type="QString"/>
-                          <Option name="outline_width_unit" value="MM" type="QString"/>
-                          <Option name="style" value="solid" type="QString"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="0,72,255,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="0,72,255,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="0,72,255,255" k="color"/>
@@ -23637,77 +24409,77 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" value="" type="QString"/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" value="collection" type="QString"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+                <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="10" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="1" xOffset="0" offsetType="0" placement="6" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-20" distUnits="MM" dist="2" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MapUnit" placementFlags="10" layerType="PointGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="AllowOverlapIfRequired" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="2" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
                 <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="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="type" value="1" type="int"/>
-                        <Option name="val" value="" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" value="true" type="bool"/>
-                        <Option name="field" value="quadrant" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" value="false" type="bool"/>
-                        <Option name="field" value="rotation" type="QString"/>
-                        <Option name="type" value="2" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                    <Option name="blendMode" value="0" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" value="" type="QString"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" value="false" type="bool"/>
-                    <Option name="enabled" value="0" type="QString"/>
-                    <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                    <Option name="minLength" value="0" type="double"/>
-                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="minLengthUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromAnchor" value="0" type="double"/>
-                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                    <Option name="offsetFromLabel" value="0" type="double"/>
-                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
@@ -23717,62 +24489,62 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" value="no_action" 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="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
-          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="100000" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -23803,9 +24575,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23813,12 +24585,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -23829,141 +24601,141 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="None">
+        <field configurationFlags="None" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="None">
+        <field configurationFlags="None" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="None">
+        <field configurationFlags="None" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Sort" configurationFlags="None">
+        <field configurationFlags="None" name="Sort">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="length_km" configurationFlags="None">
+        <field configurationFlags="None" name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="org_fid" configurationFlags="None">
+        <field configurationFlags="None" name="org_fid">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="quadrant" configurationFlags="None">
+        <field configurationFlags="None" name="quadrant">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -23972,95 +24744,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
-        <alias field="org_fid" index="12" name=""/>
-        <alias field="distance" index="13" name=""/>
-        <alias field="quadrant" index="14" name=""/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="descriptio"/>
+        <alias index="2" name="" field="timestamp"/>
+        <alias index="3" name="" field="begin"/>
+        <alias index="4" name="" field="end"/>
+        <alias index="5" name="" field="Distance"/>
+        <alias index="6" name="" field="RouteLen"/>
+        <alias index="7" name="" field="Source"/>
+        <alias index="8" name="" field="Sort"/>
+        <alias index="9" name="" field="day"/>
+        <alias index="10" name="" field="length_km"/>
+        <alias index="11" name="" field="length_m"/>
+        <alias index="12" name="" field="org_fid"/>
+        <alias index="13" name="" field="distance"/>
+        <alias index="14" name="" field="quadrant"/>
       </aliases>
       <defaults>
-        <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="Distance" applyOnUpdate="0" expression=""/>
-        <default field="RouteLen" applyOnUpdate="0" expression=""/>
-        <default field="Source" applyOnUpdate="0" expression=""/>
-        <default field="Sort" applyOnUpdate="0" expression=""/>
-        <default field="day" 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=""/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="descriptio"/>
+        <default expression="" applyOnUpdate="0" field="timestamp"/>
+        <default expression="" applyOnUpdate="0" field="begin"/>
+        <default expression="" applyOnUpdate="0" field="end"/>
+        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default expression="" applyOnUpdate="0" field="RouteLen"/>
+        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default expression="" applyOnUpdate="0" field="Sort"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="length_km"/>
+        <default expression="" applyOnUpdate="0" field="length_m"/>
+        <default expression="" applyOnUpdate="0" field="org_fid"/>
+        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default expression="" applyOnUpdate="0" field="quadrant"/>
       </defaults>
       <constraints>
-        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="descriptio" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="timestamp" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="begin" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="end" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="RouteLen" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Source" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Sort" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="length_km" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="length_m" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="org_fid" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="quadrant" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descriptio"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="timestamp"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="begin"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="end"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Distance"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Source"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Sort"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length_km"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length_m"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="org_fid"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="distance"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="quadrant"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="Sort" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
-        <constraint field="org_fid" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="quadrant" desc="" exp=""/>
+        <constraint desc="" exp="" field="Name"/>
+        <constraint desc="" exp="" field="descriptio"/>
+        <constraint desc="" exp="" field="timestamp"/>
+        <constraint desc="" exp="" field="begin"/>
+        <constraint desc="" exp="" field="end"/>
+        <constraint desc="" exp="" field="Distance"/>
+        <constraint desc="" exp="" field="RouteLen"/>
+        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" exp="" field="Sort"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="length_km"/>
+        <constraint desc="" exp="" field="length_m"/>
+        <constraint desc="" exp="" field="org_fid"/>
+        <constraint desc="" exp="" field="distance"/>
+        <constraint desc="" exp="" field="quadrant"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;">
         <columns>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="org_fid" type="field"/>
-          <column width="-1" hidden="0" name="distance" type="field"/>
-          <column width="-1" hidden="0" name="Name" type="field"/>
-          <column width="-1" hidden="0" name="Source" type="field"/>
-          <column width="-1" hidden="0" name="RouteLen" type="field"/>
-          <column width="-1" hidden="0" name="descriptio" type="field"/>
-          <column width="-1" hidden="0" name="timestamp" type="field"/>
-          <column width="-1" hidden="0" name="begin" type="field"/>
-          <column width="-1" hidden="0" name="end" type="field"/>
-          <column width="-1" hidden="0" name="Distance" type="field"/>
-          <column width="-1" hidden="0" name="length_km" type="field"/>
-          <column width="-1" hidden="0" name="Sort" type="field"/>
-          <column width="-1" hidden="0" name="quadrant" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="-1" hidden="0" name="length_m" type="field"/>
+          <column width="-1" hidden="0" type="field" name="org_fid"/>
+          <column width="-1" hidden="0" type="field" name="distance"/>
+          <column width="-1" hidden="0" type="field" name="Name"/>
+          <column width="-1" hidden="0" type="field" name="Source"/>
+          <column width="-1" hidden="0" type="field" name="RouteLen"/>
+          <column width="-1" hidden="0" type="field" name="descriptio"/>
+          <column width="-1" hidden="0" type="field" name="timestamp"/>
+          <column width="-1" hidden="0" type="field" name="begin"/>
+          <column width="-1" hidden="0" type="field" name="end"/>
+          <column width="-1" hidden="0" type="field" name="Distance"/>
+          <column width="-1" hidden="0" type="field" name="length_km"/>
+          <column width="-1" hidden="0" type="field" name="Sort"/>
+          <column width="-1" hidden="0" type="field" name="quadrant"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="-1" hidden="0" type="field" name="length_m"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24109,45 +24881,45 @@ def my_form_open(dialog, layer, feature):
         <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"/>
+        <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>Text</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -24220,58 +24992,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="229,182,54,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="229,182,54,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -24302,36 +25074,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="229,182,54,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="164,130,39,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="229,182,54,255" k="color"/>
@@ -24346,44 +25118,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="229,182,54,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="164,130,39,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -24406,38 +25178,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="114,155,111,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -24452,9 +25224,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24465,10 +25237,10 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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" value="&quot;id&quot;" type="QString"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -24483,21 +25255,21 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="area" configurationFlags="None">
+        <field configurationFlags="None" name="area">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="rotation" configurationFlags="None">
+        <field configurationFlags="None" name="rotation">
           <editWidget type="">
             <config>
               <Option/>
@@ -24506,34 +25278,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="area"/>
+        <alias index="2" name="" field="rotation"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="area" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="area"/>
+        <default expression="" applyOnUpdate="0" field="rotation"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="area" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="rotation" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="area"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="rotation"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="area" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="area"/>
+        <constraint desc="" exp="" field="rotation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="area" type="field"/>
-          <column width="-1" hidden="0" name="rotation" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="area"/>
+          <column width="-1" hidden="0" type="field" name="rotation"/>
           <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
@@ -24557,7 +25329,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -24622,7 +25394,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -24647,58 +25419,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="196,60,57,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="196,60,57,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -24729,36 +25501,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="196,60,57,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="140,43,41,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="196,60,57,255" k="color"/>
@@ -24773,44 +25545,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="196,60,57,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="140,43,41,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -24833,49 +25605,49 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule checkstate="0" symbol="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule symbol="0" checkstate="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="1" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="1" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="0,0,0,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="name" value="circle" 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="35,35,35,0" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0" 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="0.5" 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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,0" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="0.5" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -24898,20 +25670,20 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option name="active" value="true" type="bool"/>
-                      <Option 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" type="QString"/>
-                      <Option name="type" value="3" type="int"/>
+                  <Option value="" type="QString" name="name"/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="fillColor">
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
-                    <Option name="size" type="Map">
-                      <Option name="active" value="false" type="bool"/>
-                      <Option name="type" value="1" type="int"/>
-                      <Option name="val" value="" type="QString"/>
+                    <Option type="Map" name="size">
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24923,64 +25695,64 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="StringList">
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="StringList" name="dualview/previewExpressions">
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -25011,9 +25783,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25021,12 +25793,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -25037,100 +25809,100 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="length_km" configurationFlags="None">
+        <field configurationFlags="None" name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="org_fid" configurationFlags="None">
+        <field configurationFlags="None" name="org_fid">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="first_runn" configurationFlags="None">
+        <field configurationFlags="None" name="first_runn">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="last_runne" configurationFlags="None">
+        <field configurationFlags="None" name="last_runne">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -25139,85 +25911,85 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="RouteLen" index="5" name=""/>
-        <alias field="Source" index="6" name=""/>
-        <alias field="length_m" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="org_fid" index="9" name=""/>
-        <alias field="distance" index="10" name=""/>
-        <alias field="first_runn" index="11" name=""/>
-        <alias field="last_runne" index="12" name=""/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="descriptio"/>
+        <alias index="2" name="" field="timestamp"/>
+        <alias index="3" name="" field="begin"/>
+        <alias index="4" name="" field="end"/>
+        <alias index="5" name="" field="RouteLen"/>
+        <alias index="6" name="" field="Source"/>
+        <alias index="7" name="" field="length_m"/>
+        <alias index="8" name="" field="length_km"/>
+        <alias index="9" name="" field="org_fid"/>
+        <alias index="10" name="" field="distance"/>
+        <alias index="11" name="" field="first_runn"/>
+        <alias index="12" name="" field="last_runne"/>
       </aliases>
       <defaults>
-        <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=""/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="descriptio"/>
+        <default expression="" applyOnUpdate="0" field="timestamp"/>
+        <default expression="" applyOnUpdate="0" field="begin"/>
+        <default expression="" applyOnUpdate="0" field="end"/>
+        <default expression="" applyOnUpdate="0" field="RouteLen"/>
+        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default expression="" applyOnUpdate="0" field="length_m"/>
+        <default expression="" applyOnUpdate="0" field="length_km"/>
+        <default expression="" applyOnUpdate="0" field="org_fid"/>
+        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default expression="" applyOnUpdate="0" field="first_runn"/>
+        <default expression="" applyOnUpdate="0" field="last_runne"/>
       </defaults>
       <constraints>
-        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="descriptio" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="timestamp" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="begin" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="end" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="RouteLen" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="Source" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="length_m" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="length_km" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="org_fid" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="first_runn" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="last_runne" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Name"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="descriptio"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="timestamp"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="begin"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="end"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="Source"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length_m"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="length_km"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="org_fid"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="distance"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="first_runn"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="last_runne"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="org_fid" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="first_runn" desc="" exp=""/>
-        <constraint field="last_runne" desc="" exp=""/>
+        <constraint desc="" exp="" field="Name"/>
+        <constraint desc="" exp="" field="descriptio"/>
+        <constraint desc="" exp="" field="timestamp"/>
+        <constraint desc="" exp="" field="begin"/>
+        <constraint desc="" exp="" field="end"/>
+        <constraint desc="" exp="" field="RouteLen"/>
+        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" exp="" field="length_m"/>
+        <constraint desc="" exp="" field="length_km"/>
+        <constraint desc="" exp="" field="org_fid"/>
+        <constraint desc="" exp="" field="distance"/>
+        <constraint desc="" exp="" field="first_runn"/>
+        <constraint desc="" exp="" field="last_runne"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;">
         <columns>
-          <column width="179" hidden="0" name="begin" type="field"/>
-          <column width="-1" hidden="0" name="RouteLen" type="field"/>
-          <column width="-1" hidden="0" name="Source" type="field"/>
+          <column width="179" hidden="0" type="field" name="begin"/>
+          <column width="-1" hidden="0" type="field" name="RouteLen"/>
+          <column width="-1" hidden="0" type="field" name="Source"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="Name" type="field"/>
-          <column width="-1" hidden="0" name="length_m" type="field"/>
-          <column width="-1" hidden="0" name="length_km" type="field"/>
-          <column width="-1" hidden="0" name="org_fid" type="field"/>
-          <column width="-1" hidden="0" name="first_runn" type="field"/>
-          <column width="-1" hidden="0" name="last_runne" type="field"/>
-          <column width="-1" hidden="0" name="descriptio" type="field"/>
-          <column width="-1" hidden="0" name="timestamp" type="field"/>
-          <column width="-1" hidden="0" name="end" type="field"/>
-          <column width="-1" hidden="0" name="distance" type="field"/>
+          <column width="-1" hidden="0" type="field" name="Name"/>
+          <column width="-1" hidden="0" type="field" name="length_m"/>
+          <column width="-1" hidden="0" type="field" name="length_km"/>
+          <column width="-1" hidden="0" type="field" name="org_fid"/>
+          <column width="-1" hidden="0" type="field" name="first_runn"/>
+          <column width="-1" hidden="0" type="field" name="last_runne"/>
+          <column width="-1" hidden="0" type="field" name="descriptio"/>
+          <column width="-1" hidden="0" type="field" name="timestamp"/>
+          <column width="-1" hidden="0" type="field" name="end"/>
+          <column width="-1" hidden="0" type="field" name="distance"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25276,31 +26048,31 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="timestamp"/>
       </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/>
@@ -25308,7 +26080,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Line" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="0" symbologyReferenceScale="-1" wkbType="MultiLineString" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -25381,58 +26153,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="190,178,151,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="190,178,151,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -25463,36 +26235,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="190,178,151,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="136,127,108,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,178,151,255" k="color"/>
@@ -25507,44 +26279,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="190,178,151,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="136,127,108,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -25567,58 +26339,58 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
           <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
           <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="0" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="123,211,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="1" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="123,211,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -25649,50 +26421,50 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="1" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="flat" type="QString"/>
-                <Option name="customdash" value="4;1;1;1" 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="103,34,144,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="1.25" 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="1" type="QString"/>
-                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="4;1;1;1" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1.25" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -25723,30 +26495,30 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="MarkerLine" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" value="4" type="QString"/>
-                <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="average_angle_unit" value="MM" type="QString"/>
-                <Option name="interval" value="3" type="QString"/>
-                <Option name="interval_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="interval_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_along_line" value="0" type="QString"/>
-                <Option name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_along_line_unit" value="MM" 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="place_on_every_part" value="true" type="bool"/>
-                <Option name="placements" value="LastVertex" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="rotate" value="1" type="QString"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -25766,33 +26538,33 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" is_animated="0" name="@1@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="@1@1" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="FilledMarker" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" value="0" type="QString"/>
-                    <Option name="color" value="103,34,144,255" type="QString"/>
-                    <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                    <Option name="name" value="filled_arrowhead" 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="scale_method" value="diameter" type="QString"/>
-                    <Option name="size" value="5" 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 value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -25808,32 +26580,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" is_animated="0" name="@@1@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="@@1@1@0" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="103,34,144,255" type="QString"/>
-                        <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="no" type="QString"/>
-                        <Option name="outline_width" value="0" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -25848,9 +26620,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -25863,60 +26635,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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" value="id" type="QString"/>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -25947,9 +26719,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25957,12 +26729,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -25973,14 +26745,14 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -25989,30 +26761,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="type"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" type="field" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26048,8 +26820,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </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/>
@@ -26057,7 +26829,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Point" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="Point" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -26130,58 +26902,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="145,82,45,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,82,45,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26212,36 +26984,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="145,82,45,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="104,59,32,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="145,82,45,255" k="color"/>
@@ -26256,44 +27028,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="145,82,45,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="104,59,32,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -26316,44 +27088,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="label" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="15" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="63" fieldName="label" textOpacity="1" isExpression="0" namedStyle="Semibold" fontSize="15" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -26368,115 +27140,115 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
-          <placement priority="5" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="3"/>
+          <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="0" xOffset="0" offsetType="0" placement="0" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="4" offsetUnits="MM" placementFlags="10" layerType="UnknownGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="PreventOverlap" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" mergeLines="0" obstacle="1" scaleMin="0" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="0" fontMinPixelSize="3" obstacleFactor="1" minFeatureSize="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-              <Option name="blendMode" value="0" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" value="" type="QString"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" value="false" type="bool"/>
-              <Option name="enabled" value="0" type="QString"/>
-              <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-              <Option name="minLength" value="0" type="double"/>
-              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="minLengthUnit" value="MM" type="QString"/>
-              <Option name="offsetFromAnchor" value="0" type="double"/>
-              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-              <Option name="offsetFromLabel" value="0" type="double"/>
-              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0" underline="0" style="0" italic="1" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -26507,9 +27279,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26517,12 +27289,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="18" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -26533,14 +27305,14 @@ def my_form_open(dialog, layer, feature):
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label" configurationFlags="None">
+        <field configurationFlags="None" name="label">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -26549,29 +27321,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="label"/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="label"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="label"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
-          <column width="-1" hidden="0" name="label" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="label"/>
           <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
@@ -26608,8 +27380,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="label"/>
       </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/>
@@ -26617,7 +27389,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
+    <maplayer autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" labelsEnabled="1" symbologyReferenceScale="-1" wkbType="MultiPolygon" hasScaleBasedVisibilityFlag="0" type="vector" simplifyLocal="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -26682,7 +27454,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
+          <spatial maxx="0" minx="0" miny="0" dimensions="2" crs="" minz="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -26707,58 +27479,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
+      <temporal startExpression="" mode="0" accumulate="0" endExpression="" durationUnit="min" fixedDuration="0" enabled="0" startField="" endField="" limitMode="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
+      <elevation respectLayerSymbol="1" zoffset="0" binding="Centroid" symbology="Line" clamping="Terrain" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="125,139,143,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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="125,139,143,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26789,36 +27561,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="125,139,143,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="89,99,102,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 value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="125,139,143,255" k="color"/>
@@ -26833,44 +27605,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="125,139,143,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="89,99,102,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 value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -26893,54 +27665,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
+          <rule description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
             <settings calloutType="simple">
-              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="label" fontWeight="75" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Bold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="31,120,180,255" multilineHeight="1" forcedBold="0">
+              <text-style fontWeight="75" fieldName="label" textOpacity="0.90000000000000002" isExpression="0" namedStyle="Bold" fontSize="8" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="31,120,180,255" useSubstitutions="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.40000000000000002" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="0.75" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <background shapeOffsetY="-0.14999999999999999" shapeSizeY="0.29999999999999999" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeRotation="0" shapeBorderColor="31,120,206,255" shapeBorderWidthUnit="MM" shapeRadiiX="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.75" shapeType="0" shapeFillColor="255,255,255,204" shapeJoinStyle="64" shapeOpacity="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeRotationType="0" shapeRadiiUnit="MM">
-                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferSize="0.75" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="0" bufferJoinStyle="128"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+                <background shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeOffsetY="-0.14999999999999999" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0.75" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,204" shapeRadiiY="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="1" shapeOpacity="0.59999999999999998" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0.75" shapeRotationType="0" shapeSizeY="0.29999999999999999">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="markerSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="angle" value="0" type="QString"/>
-                        <Option name="cap_style" value="square" type="QString"/>
-                        <Option name="color" value="196,60,57,255" type="QString"/>
-                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                        <Option name="joinstyle" value="bevel" type="QString"/>
-                        <Option name="name" value="circle" 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="35,35,35,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="196,60,57,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -26963,34 +27735,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+                  <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                        <Option name="color" value="255,255,255,204" type="QString"/>
-                        <Option name="joinstyle" value="round" 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="31,120,206,255" type="QString"/>
-                        <Option name="outline_style" value="solid" type="QString"/>
-                        <Option name="outline_width" value="0.75" type="QString"/>
-                        <Option name="outline_width_unit" value="MM" type="QString"/>
-                        <Option name="style" value="solid" type="QString"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,204" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="31,120,206,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.75" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,204" k="color"/>
@@ -27005,56 +27777,56 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" value="" type="QString"/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" value="collection" type="QString"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+                <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
-              <placement priority="5" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="1" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="1" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PolygonGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="1" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering maxNumLabels="6" unplacedVisibility="0" obstacleFactor="0.76000000000000001" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="5" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
+              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" plussign="0" addDirectionSymbol="0" wrapChar="" leftDirectionSymbol="&lt;" multilineAlign="1"/>
+              <placement overrunDistanceUnit="MM" lineAnchorType="0" rotationUnit="AngleDegrees" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" priority="5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" allowDegraded="0" xOffset="1" offsetType="0" placement="0" lineAnchorPercent="0.5" maxCurvedCharAngleOut="-25" distUnits="MM" dist="0" centroidInside="0" polygonPlacementFlags="2" lineAnchorClipping="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" quadOffset="1" offsetUnits="MapUnit" placementFlags="10" layerType="PolygonGeometry" geometryGenerator="" rotationAngle="0" overlapHandling="PreventOverlap" centroidWhole="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" yOffset="0" geometryGeneratorType="PointGeometry"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="6" mergeLines="0" obstacle="1" scaleMin="1" limitNumLabels="0" obstacleType="0" unplacedVisibility="0" labelPerPart="0" scaleVisibility="0" drawLabels="1" scaleMax="10000000" fontMinPixelSize="3" obstacleFactor="0.76000000000000001" minFeatureSize="0" upsidedownLabels="0" zIndex="5" fontLimitPixelSize="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
-                  <Option name="blendMode" value="0" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" value="" type="QString"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" value="false" type="bool"/>
-                  <Option name="enabled" value="0" type="QString"/>
-                  <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
-                  <Option name="minLength" value="0" type="double"/>
-                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="minLengthUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromAnchor" value="0" type="double"/>
-                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
-                  <Option name="offsetFromLabel" value="0" type="double"/>
-                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol is_animated=&quot;0&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -27063,66 +27835,66 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
-          <fontProperties underline="0" strikethrough="0" style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
-          <attribute field="" color="#000000" colorOpacity="1" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory scaleBasedVisibility="0" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" width="15" barWidth="5" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" spacing="0" penColor="#000000" rotationOffset="270" height="15" penWidth="0" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" opacity="1" minScaleDenominator="0" direction="1" lineSizeType="MM" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="35,35,35,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0.26" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -27153,9 +27925,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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27163,66 +27935,66 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" zIndex="0" obstacle="0" placement="0" linePlacementFlags="2" showAll="1" priority="0">
         <properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" value="0" type="double"/>
-            <Option name="allowedGapsEnabled" value="false" type="bool"/>
-            <Option name="allowedGapsLayer" value="" type="QString"/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option value="0" type="double" name="allowedGapsBuffer"/>
+            <Option value="false" type="bool" name="allowedGapsEnabled"/>
+            <Option value="" type="QString" name="allowedGapsLayer"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
       <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_set" configurationFlags="None">
+        <field configurationFlags="None" name="table_set">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label" configurationFlags="None">
+        <field configurationFlags="None" name="label">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="races" configurationFlags="None">
+        <field configurationFlags="None" name="races">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -27231,45 +28003,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="table_set"/>
+        <alias index="2" name="" field="label"/>
+        <alias index="3" name="" field="races"/>
+        <alias index="4" name="" field="day"/>
       </aliases>
       <defaults>
-        <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=""/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="table_set"/>
+        <default expression="" applyOnUpdate="0" field="label"/>
+        <default expression="" applyOnUpdate="0" field="races"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="table_set" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="label" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="races" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
-        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="id"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="table_set"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="label"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="races"/>
+        <constraint exp_strength="0" unique_strength="0" notnull_strength="0" constraints="0" field="day"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="table_set" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="races" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="table_set"/>
+        <constraint desc="" exp="" field="label"/>
+        <constraint desc="" exp="" field="races"/>
+        <constraint desc="" exp="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown" sortOrder="0">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
           <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" hidden="0" name="table_set" type="field"/>
-          <column width="-1" hidden="0" name="label" type="field"/>
-          <column width="-1" hidden="0" name="day" type="field"/>
-          <column width="130" hidden="0" name="races" type="field"/>
+          <column width="-1" hidden="0" type="field" name="table_set"/>
+          <column width="-1" hidden="0" type="field" name="label"/>
+          <column width="-1" hidden="0" type="field" name="day"/>
+          <column width="130" hidden="0" type="field" name="races"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27308,18 +28080,18 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="table_set"/>
       </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/>
@@ -27353,6 +28125,7 @@ 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="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+    <layer id="cone_only_groups_5655c566_c302_4743_a580_b3593f83c018"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -27521,7 +28294,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal plan/Gun Run 2022 - Marshal Plan rev 4.1.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Fencing/Gun Run 2022 - Fencing rev 2.1 - Fences and Cones.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -27683,299 +28456,302 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option name="name" value="" type="QString"/>
+      <Option value="" type="QString" name="name"/>
       <Option name="properties"/>
-      <Option name="type" value="collection" type="QString"/>
+      <Option value="collection" type="QString" name="type"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1" style="default"/>
+      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Ask Me"/>
+        <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="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Fencing">
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1" style="Fencing"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" visible="1" 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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="water_tables20170921142016467" expanded="1" visible="0" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" visible="1" 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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" 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 id="water_tables20170921142016467" visible="0" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal map - inset">
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" 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 id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" visible="1" 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 id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1" style="default"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" visible="0" 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 id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes/Markers"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes/Markers"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal map - main">
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="water_tables20170921142016467" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" visible="0" 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 id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <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="Routes"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal map - main">
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" visible="1" 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 id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" visible="1" 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 id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes/Markers"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes/Markers"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal overview">
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="water_tables20170921142016467" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" visible="0" 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 id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <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="Routes"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal plan">
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" visible="1" 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 id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" visible="1" 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 id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="water_tables20170921142016467" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" visible="0" 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 id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Feeding Stations"/>
         <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="Routes"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Routes">
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" visible="1" 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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="water_tables20170921142016467" expanded="1" visible="0" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" visible="0" 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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" 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 id="water_tables20170921142016467" visible="0" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <checked-group-nodes>
+        <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="Routes"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1" style="Fencing"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1" style="default"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="water_tables20170921142016467" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" visible="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1" visible="1" style="default"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-group-nodes>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -28002,31 +28778,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" printResolution="120" name="Marshals" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="120" units="mm" name="Marshals" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -28041,49 +28817,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" referencePoint="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -28098,9 +28874,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28108,15 +28884,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="128.508,3.98741,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frame="true" equalColumnWidth="1" itemRotation="0" zValue="5" background="true" symbolWidth="7" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" blendMode="0" opacity="1" position="128.508,3.98741,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.1,mm" size="19.9422,32,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="bevel" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
-        <FrameColor green="128" blue="128" alpha="255" red="128"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem wrapChar="" columnSpace="2" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="128.508,3.98741,mm" columnCount="1" opacity="1" frameJoinStyle="bevel" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" type="65642" outlineWidthM="0.1,mm" zValue="5" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="19.9422,32,mm" boxSpace="2" symbolWidth="7" minSymbolSize="0" position="128.508,3.98741,mm" frame="true" symbolHeight="4" title="" referencePoint="0" positionLock="true" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="1" lineSpacing="1" resizeToContents="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" itemRotation="0" rasterBorder="1">
+        <FrameColor red="128" green="128" blue="128" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28124,37 +28900,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" bold="0" underline="0" style="Regular" italic="0" strikethrough="0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="1" indent="0" name="subgroup" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="1" name="subgroup">
+            <styleFont description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" name="symbol" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginTop="2" name="symbol">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
-                  <Option name="showFeatureCount" value="0" type="int"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option value="0" type="int" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28162,62 +28938,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem id="Inset map" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" referencePoint="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" position="98.7828,149.027,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="56.5192,54.5647,mm" mapFlags="0" positionLock="true" positionOnPage="98.7828,149.027,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal map - inset" outlineWidthM="0.2,mm" frame="true" itemRotation="0" zValue="4" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="4" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Inset map" frameJoinStyle="miter" isTemporal="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" followPresetName="Marshal map - inset" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.2,mm" size="56.5192,54.5647,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="98.7828,149.027,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="98.7828,149.027,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41788569471234993" xmax="18.42218047871277165" ymax="-33.94188878914365404" ymin="-33.94603505205213878"/>
+        <Extent ymin="-33.94603505205213878" ymax="-33.94188878914365404" xmax="18.42218047871277165" xmin="18.41788569471234993"/>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -28248,44 +29024,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -28308,40 +29084,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -28356,29 +29132,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28386,28 +29162,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" show="1" inverted="0" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" centered="1">
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <ComposerMapOverview blendMode="0" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" name="Overview 1" inverted="0">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="0,65,170,127" 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="35,35,35,102" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,65,170,127" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,102" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,65,170,127" k="color"/>
@@ -28422,9 +29198,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28432,9 +29208,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28442,69 +29218,69 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Main map" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" referencePoint="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3.53,6.0007,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="142,187.018,mm" mapFlags="0" positionLock="true" positionOnPage="3.53,6.0007,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="false" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal map - main" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="3" mapFlags="0" frame="false" positionLock="true" mapRotation="0" id="Main map" frameJoinStyle="miter" isTemporal="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" followPresetName="Marshal map - main" background="false" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="142,187.018,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="3.53,6.0007,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="3.53,6.0007,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41951926258746752" xmax="18.42054691083765405" ymax="-33.94328520011277561" ymin="-33.94463864108302431"/>
+        <Extent ymin="-33.94463864108302431" ymax="-33.94328520011277561" xmax="18.42054691083765405" xmin="18.41951926258746752"/>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -28535,44 +29311,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -28595,40 +29371,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -28643,29 +29419,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28673,22 +29449,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" referencePoint="2" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" position="290.617,6.0007,mm" sectionWidth="142.117" blendMode="0" opacity="1" hidePageIfEmpty="0" size="142.117,187.018,mm" positionLock="true" positionOnPage="290.617,6.0007,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionHeight="187.018" groupUuid="" hideBackgroundIfEmpty="0" excludeFromExports="0" background="false" frameJoinStyle="round" visibility="1" sectionX="0" outlineWidthM="0.3,mm" frame="false" itemRotation="0" sectionY="0" zValue="2" type="65647">
-        <FrameColor green="119" blue="119" alpha="255" red="119"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="2" frame="false" positionLock="true" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" id="" sectionHeight="187.018" frameJoinStyle="round" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" sectionX="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" background="false" sectionWidth="142.117" referencePoint="2" itemRotation="0" outlineWidthM="0.3,mm" size="142.117,187.018,mm" excludeFromExports="0" hideBackgroundIfEmpty="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="290.617,6.0007,mm" type="65647" positionOnPage="290.617,6.0007,mm" sectionY="0" hidePageIfEmpty="0">
+        <FrameColor red="119" green="119" blue="119" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28696,21 +29472,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" referencePoint="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" position="246.665,178.41,mm" anchorPoint="0" blendMode="0" opacity="1" pictureHeight="25.2491" size="47.1065,27.6,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="246.665,178.41,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_500.png" pictureWidth="47.1065" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../GunRun2022_500.png" zValue="1" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="47.1065" id="" pictureHeight="25.2491" frameJoinStyle="miter" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgFillColor="255,255,255,255" mapUuid="" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="47.1065,27.6,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="246.665,178.41,mm" type="65640" anchorPoint="0" positionOnPage="246.665,178.41,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28718,14 +29494,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame contentMode="1" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" resizeMode="0" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" evaluateExpressions="true" maxBreakDistance="12" useSmartBreaks="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" type="65648" 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>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;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_phone&quot;%]&lt;/td>&lt;tr>&#xa;&#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 return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" url="">
+      <LayoutMultiFrame templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&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;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_phone&quot;%]&lt;/td>&lt;tr>&#xa;&#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 return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" useSmartBreaks="true" stylesheetEnabled="true" url="" evaluateExpressions="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" contentMode="1" resizeMode="0" type="65648" maxBreakDistance="12" 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="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28735,53 +29511,53 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="jpg" type="QString"/>
-          <Option name="forceVector" value="0" type="QString"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropMarginUnit" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
-          <Option name="pdfTextFormat" value="0" type="QString"/>
-          <Option name="rasterize" value="false" type="QString"/>
-          <Option name="resizeToContentsBottomMargin" value="3.53" type="QString"/>
-          <Option name="resizeToContentsLeftMargin" value="3.53" type="QString"/>
-          <Option name="resizeToContentsRightMargin" value="3.53" type="QString"/>
-          <Option name="resizeToContentsTopMargin" value="3.53" type="QString"/>
-          <Option name="singleFile" value="false" type="QString"/>
+          <Option value="jpg" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="0" type="QString" name="imageCropMarginUnit"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="false" type="QString" name="rasterize"/>
+          <Option value="3.53" type="QString" name="resizeToContentsBottomMargin"/>
+          <Option value="3.53" type="QString" name="resizeToContentsLeftMargin"/>
+          <Option value="3.53" type="QString" name="resizeToContentsRightMargin"/>
+          <Option value="3.53" type="QString" name="resizeToContentsTopMargin"/>
+          <Option value="false" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1" pageNameExpression="&quot;position&quot;" sortKey="&quot;id&quot;" enabled="1" hideCoverage="0" coverageLayerName="marshal_positions"/>
+      <Atlas sortFeatures="1" sortKey="&quot;id&quot;" filterFeatures="0" coverageLayerName="marshal_positions" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayerProvider="ogr" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortAscending="1" enabled="1" hideCoverage="0" pageNameExpression="&quot;position&quot;"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="300" name="Start &amp; Finish Backgrounds" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="300" units="mm" name="Start &amp; Finish Backgrounds" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -28796,49 +29572,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" referencePoint="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -28853,9 +29629,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28863,21 +29639,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem id="" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" referencePoint="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" position="286.027,2,mm" anchorPoint="0" blendMode="0" opacity="1" pictureHeight="7.97477" size="9.45865,11,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="286.027,2,mm" svgBorderColor="0,0,0,255" northMode="0" file="arrows/NorthArrow_11.svg" pictureWidth="6.31767" groupUuid="" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="330" visibility="1" mode="0" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="arrows/NorthArrow_11.svg" zValue="4" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="6.31767" id="" pictureHeight="7.97477" frameJoinStyle="miter" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderWidth="0.2" pictureRotation="330" mode="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgFillColor="255,255,255,255" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="9.45865,11,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="286.027,2,mm" type="65640" anchorPoint="0" positionOnPage="286.027,2,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28885,47 +29661,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" halign="1" referencePoint="0" labelText="[%upper( &quot;area&quot; )%]" marginX="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" position="285.027,205.886,mm" blendMode="0" opacity="1" size="142.543,10.3185,mm" positionLock="true" positionOnPage="285.027,205.886,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="270" valign="64" zValue="3" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="3" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" labelText="[%upper( &quot;area&quot; )%]" halign="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="270" outlineWidthM="0.3,mm" size="142.543,10.3185,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="285.027,205.886,mm" type="65641" positionOnPage="285.027,205.886,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -28940,65 +29716,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" lineJoinStyle="miter" style="Single Box" outlineWidth="0.3" segmentMillimeters="26.3519" alignment="0" referencePoint="0" positionOnPage="7,189.669,mm" type="65646" labelHorizontalPlacement="0" minBarWidth="50" subdivisionsHeight="1.5" visibility="1" unitType="meters" boxContentSpace="1" labelBarSpace="3" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frame="false" itemRotation="0" segmentSizeMode="1" zValue="2" labelVerticalPlacement="0" background="false" lineCapStyle="square" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" blendMode="0" opacity="1" position="7,189.669,mm" positionLock="true" numMapUnitsPerScaleBarUnit="1" numSegmentsLeft="2" numSubdivisions="1" maxBarWidth="150" outlineWidthM="0.3,mm" numSegments="4" unitLabel="m" size="145.54,16.2165,mm" groupUuid="" excludeFromExports="0" frameJoinStyle="miter" id="" height="3" numUnitsPerSegment="100">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem numSubdivisions="1" groupUuid="" background="false" outlineWidth="0.3" lineJoinStyle="miter" positionOnPage="7,189.669,mm" unitType="meters" labelHorizontalPlacement="0" unitLabel="m" opacity="1" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" blendMode="0" alignment="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" minBarWidth="50" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" type="65646" labelBarSpace="3" lineCapStyle="square" outlineWidthM="0.3,mm" zValue="2" excludeFromExports="0" id="" numSegmentsLeft="2" size="145.54,16.2165,mm" position="7,189.669,mm" labelVerticalPlacement="0" frame="false" numUnitsPerSegment="100" referencePoint="0" positionLock="true" height="3" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" numSegments="4" visibility="1" segmentMillimeters="26.3519" style="Single Box" subdivisionsHeight="1.5" itemRotation="0" maxBarWidth="150" segmentSizeMode="1" boxContentSpace="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29013,75 +29789,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" blue="0" alpha="255" red="0"/>
+        <strokeColor red="0" green="0" blue="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" value="" type="QChar"/>
-            <Option name="decimals" value="6" type="int"/>
-            <Option name="rounding_type" value="0" type="int"/>
-            <Option name="show_plus" value="false" type="bool"/>
-            <Option name="show_thousand_separator" value="true" type="bool"/>
-            <Option name="show_trailing_zeros" value="false" type="bool"/>
-            <Option name="thousand_separator" value="" type="QChar"/>
+            <Option value="" type="QChar" name="decimal_separator"/>
+            <Option value="6" type="int" name="decimals"/>
+            <Option value="0" type="int" name="rounding_type"/>
+            <Option value="false" type="bool" name="show_plus"/>
+            <Option value="true" type="bool" name="show_thousand_separator"/>
+            <Option value="false" type="bool" name="show_trailing_zeros"/>
+            <Option value="" type="QChar" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor green="0" blue="0" alpha="255" red="0"/>
-        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
+        <fillColor red="0" green="0" blue="0" alpha="255"/>
+        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="miter" type="QString"/>
-                <Option name="line_color" value="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.3" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.3" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29112,52 +29888,52 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="miter" type="QString"/>
-                <Option name="line_color" value="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.3" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.3" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29188,52 +29964,52 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="miter" type="QString"/>
-                <Option name="line_color" value="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.3" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.3" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29264,36 +30040,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="0,0,0,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -29308,36 +30084,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -29352,87 +30128,87 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem id="" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" referencePoint="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" position="7,5.5,mm" mapRotation="330" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="278.027,180.318,mm" mapFlags="0" positionLock="true" positionOnPage="7,5.5,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="false" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Start/Finish" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="false" positionLock="true" mapRotation="330" id="" frameJoinStyle="miter" isTemporal="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" followPresetName="Start/Finish" background="false" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="278.027,180.318,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="7,5.5,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="7,5.5,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="field" value="rotation" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="rotation" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="id" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="id" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="angle" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedRotation">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="angle" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40843143571575169" xmax="18.41790915398017958" ymax="-33.89880140828828559" ymin="-33.90494830469008747"/>
+        <Extent ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmax="18.41790915398017958" xmin="18.40843143571575169"/>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="4" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="3" offsetY="0" topAnnotationDisplay="3" gridFrameStyle="0" gridFrameMargin="0" unit="1" intervalY="5" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="5" gridStyle="0" blendMode="0" bottomAnnotationDisplay="3" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="3" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="1" gridFrameMargin="0" annotationFormat="4" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="3" annotationExpression="" intervalY="5" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="5" bottomAnnotationDisplay="3" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="195,195,195,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="195,195,195,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -29463,44 +30239,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -29523,9 +30299,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -29542,32 +30318,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -29582,29 +30358,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29612,65 +30388,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.05"/>
+        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="QString"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
-          <Option name="pdfTextFormat" value="0" type="QString"/>
-          <Option name="singleFile" value="true" type="QString"/>
-          <Option name="svgCropMarginBottom" value="0" type="QString"/>
-          <Option name="svgCropMarginLeft" value="0" type="QString"/>
-          <Option name="svgCropMarginRight" value="0" type="QString"/>
-          <Option name="svgCropMarginTop" value="0" type="QString"/>
-          <Option name="svgCropToContents" value="true" type="QString"/>
-          <Option name="svgDisableRasterTiles" value="0" type="QString"/>
-          <Option name="svgGroupLayers" value="false" type="QString"/>
-          <Option name="svgIncludeMetadata" value="1" type="QString"/>
-          <Option name="svgTextFormat" value="0" type="QString"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
+          <Option value="0" type="QString" name="svgCropMarginBottom"/>
+          <Option value="0" type="QString" name="svgCropMarginLeft"/>
+          <Option value="0" type="QString" name="svgCropMarginRight"/>
+          <Option value="0" type="QString" name="svgCropMarginTop"/>
+          <Option value="true" type="QString" name="svgCropToContents"/>
+          <Option value="0" type="QString" name="svgDisableRasterTiles"/>
+          <Option value="false" type="QString" name="svgGroupLayers"/>
+          <Option value="1" type="QString" name="svgIncludeMetadata"/>
+          <Option value="0" type="QString" name="svgTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;area&quot;" sortKey="area" enabled="1" hideCoverage="1" coverageLayerName="start_finish_area"/>
+      <Atlas sortFeatures="1" sortKey="area" filterFeatures="0" coverageLayerName="start_finish_area" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="ogr" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortAscending="1" enabled="1" hideCoverage="1" pageNameExpression="&quot;area&quot;"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="300" name="Fencing" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="300" units="mm" name="Fencing" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -29685,49 +30461,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" referencePoint="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -29742,9 +30518,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29752,15 +30528,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="256.808,5.21277,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="true" equalColumnWidth="1" itemRotation="0" zValue="11" background="true" symbolWidth="7" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" blendMode="0" opacity="1" position="256.808,5.21277,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="38.1563,67.2879,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem wrapChar="" columnSpace="2" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="256.808,5.21277,mm" columnCount="1" opacity="1" frameJoinStyle="miter" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" type="65642" outlineWidthM="0.3,mm" zValue="11" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="38.1563,67.2879,mm" boxSpace="2" symbolWidth="7" minSymbolSize="0" position="256.808,5.21277,mm" frame="true" symbolHeight="4" title="" referencePoint="0" positionLock="true" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="1" lineSpacing="1" resizeToContents="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" itemRotation="0" rasterBorder="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29768,53 +30544,53 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" bold="1" underline="0" style="Bold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="3" indent="0" name="group" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="3" name="group">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="3" indent="0" name="subgroup" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="3" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" underline="0" style="Regular" italic="0" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Fencing and Cones" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" expanded="1" providerKey="ogr" name="fencing" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="fencing" source="./fencing.shp|layername=fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
-                  <Option name="legend/expressionFilter" value="" type="QString"/>
-                  <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
-                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
+                  <Option value="" type="QString" name="legend/expressionFilter"/>
+                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
-                  <Option name="showFeatureCount" value="0" type="int"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option value="0" type="int" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29822,47 +30598,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem id="" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" halign="1" referencePoint="0" labelText="FENCING: [% &quot;name&quot; %]" marginX="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" position="6.76779,191.188,mm" blendMode="0" opacity="1" size="148.46,6.45211,mm" positionLock="true" positionOnPage="6.76779,191.188,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="10" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="10" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" labelText="FENCING: [% &quot;name&quot; %]" halign="1" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="148.46,6.45211,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="6.76779,191.188,mm" type="65641" positionOnPage="6.76779,191.188,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="63" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29877,65 +30653,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" halign="2" referencePoint="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" marginX="0" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" position="182.723,191.188,mm" blendMode="0" opacity="1" size="56.3557,6.45237,mm" positionLock="true" positionOnPage="182.723,191.188,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="9" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="9" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" halign="2" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginY="0" htmlState="1" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="56.3557,6.45237,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="182.723,191.188,mm" type="65641" positionOnPage="182.723,191.188,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29950,65 +30726,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" halign="2" referencePoint="0" labelText="REVISION 2.0" marginX="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" position="209.146,198.083,mm" blendMode="0" opacity="1" size="26.8205,6.82826,mm" positionLock="true" positionOnPage="209.146,198.083,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="8" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="8" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" labelText="REVISION 2.1" halign="2" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="26.8205,6.82826,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="209.146,198.083,mm" type="65641" positionOnPage="209.146,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30023,65 +30799,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" halign="1" referencePoint="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" marginX="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" position="62.6706,198.083,mm" blendMode="0" opacity="1" size="51.1638,7.07327,mm" positionLock="true" positionOnPage="62.6706,198.083,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="7" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="7" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" halign="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="51.1638,7.07327,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="62.6706,198.083,mm" type="65641" positionOnPage="62.6706,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30096,65 +30872,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" halign="1" referencePoint="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" marginX="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" position="116.805,198.083,mm" blendMode="0" opacity="1" size="64.7594,7.10512,mm" positionLock="true" positionOnPage="116.805,198.083,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="6" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="6" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" halign="1" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="64.7594,7.10512,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="116.805,198.083,mm" type="65641" positionOnPage="116.805,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30169,65 +30945,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" halign="1" referencePoint="0" labelText="Page [% @atlas_featurenumber %]" marginX="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" position="6.76779,198.083,mm" blendMode="0" opacity="1" size="52.7903,7.07327,mm" positionLock="true" positionOnPage="6.76779,198.083,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="5" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" labelText="Page [% @atlas_featurenumber %]" halign="1" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="52.7903,7.07327,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="6.76779,198.083,mm" type="65641" positionOnPage="6.76779,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30242,39 +31018,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" referencePoint="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" position="243.098,175.353,mm" anchorPoint="8" blendMode="0" opacity="1" pictureHeight="26.4325" size="49.3143,29.8354,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="243.098,175.353,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_250.png" pictureWidth="49.3143" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../GunRun2022_250.png" zValue="4" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="49.3143" id="" pictureHeight="26.4325" frameJoinStyle="miter" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgFillColor="255,255,255,255" mapUuid="" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="49.3143,29.8354,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="243.098,175.353,mm" type="65640" anchorPoint="8" positionOnPage="243.098,175.353,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30282,42 +31058,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" referencePoint="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" position="6.91779,197.79,mm" blendMode="0" opacity="1" size="232.01,0.14328,mm" positionLock="true" positionOnPage="6.91779,197.79,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="3" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" cornerRadiusMeasure="0,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="232.01,0.14328,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="6.91779,197.79,mm" type="65643" positionOnPage="6.91779,197.79,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -30332,55 +31108,55 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" lineJoinStyle="round" style="Double Box" outlineWidth="0.2" segmentMillimeters="32.0947" alignment="0" referencePoint="0" positionOnPage="6.76779,2.8482,mm" type="65646" labelHorizontalPlacement="0" minBarWidth="25" subdivisionsHeight="1.5" visibility="1" unitType="meters" boxContentSpace="0.2" labelBarSpace="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="false" itemRotation="0" segmentSizeMode="1" zValue="2" labelVerticalPlacement="0" background="false" lineCapStyle="square" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" blendMode="0" opacity="1" position="6.76779,2.8482,mm" positionLock="true" numMapUnitsPerScaleBarUnit="1" numSegmentsLeft="2" numSubdivisions="1" maxBarWidth="100" outlineWidthM="0.3,mm" numSegments="2" unitLabel="m" size="106.045,15.8378,mm" groupUuid="" excludeFromExports="0" frameJoinStyle="miter" id="" height="2" numUnitsPerSegment="20">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem numSubdivisions="1" groupUuid="" background="false" outlineWidth="0.2" lineJoinStyle="round" positionOnPage="6.76779,2.8482,mm" unitType="meters" labelHorizontalPlacement="0" unitLabel="m" opacity="1" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" blendMode="0" alignment="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" minBarWidth="25" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" type="65646" labelBarSpace="1" lineCapStyle="square" outlineWidthM="0.3,mm" zValue="2" excludeFromExports="0" id="" numSegmentsLeft="2" size="106.045,15.8378,mm" position="6.76779,2.8482,mm" labelVerticalPlacement="0" frame="false" numUnitsPerSegment="20" referencePoint="0" positionLock="true" height="2" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" numSegments="2" visibility="1" segmentMillimeters="32.0947" style="Double Box" subdivisionsHeight="1.5" itemRotation="0" maxBarWidth="100" segmentSizeMode="1" boxContentSpace="0.2">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30395,75 +31171,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" blue="0" alpha="255" red="0"/>
+        <strokeColor red="0" green="0" blue="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" value="" type="QChar"/>
-            <Option name="decimals" value="6" type="int"/>
-            <Option name="rounding_type" value="0" type="int"/>
-            <Option name="show_plus" value="false" type="bool"/>
-            <Option name="show_thousand_separator" value="true" type="bool"/>
-            <Option name="show_trailing_zeros" value="false" type="bool"/>
-            <Option name="thousand_separator" value="" type="QChar"/>
+            <Option value="" type="QChar" name="decimal_separator"/>
+            <Option value="6" type="int" name="decimals"/>
+            <Option value="0" type="int" name="rounding_type"/>
+            <Option value="false" type="bool" name="show_plus"/>
+            <Option value="true" type="bool" name="show_thousand_separator"/>
+            <Option value="false" type="bool" name="show_trailing_zeros"/>
+            <Option value="" type="QChar" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor green="0" blue="0" alpha="255" red="0"/>
-        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
+        <fillColor red="0" green="0" blue="0" alpha="255"/>
+        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="round" type="QString"/>
-                <Option name="line_color" value="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.2" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30494,52 +31270,52 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="round" type="QString"/>
-                <Option name="line_color" value="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.2" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30570,52 +31346,52 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
               <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="round" type="QString"/>
-                <Option name="line_color" value="0,0,0,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.2" 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 value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30646,36 +31422,36 @@ 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 value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="0,0,0,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -30690,36 +31466,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -30734,53 +31510,53 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem id="" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" referencePoint="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" position="6.76779,9.35102,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="0.9" size="283.418,180.92,mm" mapFlags="0" positionLock="true" positionOnPage="6.76779,9.35102,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="false" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Fencing" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="false" positionLock="true" mapRotation="0" id="" frameJoinStyle="miter" isTemporal="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" followPresetName="Fencing" background="false" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="283.418,180.92,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="0.9" groupUuid="" position="6.76779,9.35102,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="transformer" type="Map">
-                    <Option name="d" type="Map">
-                      <Option name="exponent" value="1" type="double"/>
-                      <Option name="maxOutput" value="360" type="double"/>
-                      <Option name="maxValue" value="0" type="double"/>
-                      <Option name="minOutput" value="0" type="double"/>
-                      <Option name="minValue" value="0" type="double"/>
-                      <Option name="nullOutput" value="0" type="double"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option type="Map" name="transformer">
+                    <Option type="Map" name="d">
+                      <Option value="1" type="double" name="exponent"/>
+                      <Option value="360" type="double" name="maxOutput"/>
+                      <Option value="0" type="double" name="maxValue"/>
+                      <Option value="0" type="double" name="minOutput"/>
+                      <Option value="0" type="double" name="minValue"/>
+                      <Option value="0" type="double" name="nullOutput"/>
                     </Option>
-                    <Option name="t" value="0" type="int"/>
+                    <Option value="0" type="int" name="t"/>
                   </Option>
-                  <Option name="type" value="3" type="int"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="angle" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedRotation">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="angle" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40366172969380543" xmax="18.40524827801807461" ymax="-33.90718453497852636" ymin="-33.90819730717838354"/>
+        <Extent ymin="-33.90819730717838354" ymax="-33.90718453497852636" xmax="18.40524827801807461" xmin="18.40366172969380543"/>
         <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>
@@ -30795,45 +31571,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="4" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="3" offsetY="0" topAnnotationDisplay="3" gridFrameStyle="0" gridFrameMargin="0" unit="1" intervalY="5" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="5" gridStyle="0" blendMode="0" bottomAnnotationDisplay="3" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="3" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="1" gridFrameMargin="0" annotationFormat="4" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="3" annotationExpression="" intervalY="5" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="5" bottomAnnotationDisplay="3" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="195,195,195,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="195,195,195,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -30864,44 +31640,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -30924,9 +31700,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -30943,32 +31719,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -30983,29 +31759,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31013,65 +31789,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0.40000000000000002"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="int"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfAppendGeoreference" value="1" type="int"/>
-          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
-          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
-          <Option name="pdfExportThemes" value="" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="int"/>
-          <Option 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~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString"/>
-          <Option name="pdfLosslessImages" value="0" type="int"/>
-          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
-          <Option name="pdfSimplify" value="1" type="int"/>
-          <Option name="pdfTextFormat" value="0" type="int"/>
-          <Option name="rasterize" value="true" type="QString"/>
-          <Option name="singleFile" value="true" type="bool"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="int" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="1" type="int" name="pdfAppendGeoreference"/>
+          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
+          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="int" name="pdfIncludeMetadata"/>
+          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_5655c566_c302_4743_a580_b3593f83c018" type="QString" name="pdfLayerOrder"/>
+          <Option value="0" type="int" name="pdfLosslessImages"/>
+          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="int" name="pdfSimplify"/>
+          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="rasterize"/>
+          <Option value="true" type="bool" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortFeatures="1" coverageLayerProvider="virtual" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;name&quot;" sortKey="&quot;group&quot;" enabled="1" hideCoverage="1" coverageLayerName="fence_groups"/>
+      <Atlas sortFeatures="1" sortKey="&quot;group&quot;" filterFeatures="0" coverageLayerName="fence_groups" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="virtual" 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(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" sortAscending="1" enabled="1" hideCoverage="1" pageNameExpression="&quot;name&quot;"/>
     </Layout>
-    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="144" name="Ask Me" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="9" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" units="mm" name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="9" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -31086,49 +31862,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" referencePoint="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -31143,59 +31919,59 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" units="mm" page="0" orientation="2"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem id="" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" halign="1" referencePoint="0" labelText="Directions to Start of Race" marginX="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" position="4.43449,186.634,mm" blendMode="0" opacity="1" size="83.9998,10.4638,mm" positionLock="false" positionOnPage="4.43449,186.634,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="8" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="8" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" labelText="Directions to Start of Race" halign="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="83.9998,10.4638,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="4.43449,186.634,mm" type="65641" positionOnPage="4.43449,186.634,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="14" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="14" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31210,65 +31986,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" halign="1" referencePoint="0" labelText="Gun Run" marginX="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" position="4.43449,197.498,mm" blendMode="0" opacity="1" size="48.2923,9.511,mm" positionLock="false" positionOnPage="4.43449,197.498,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="7" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="7" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" labelText="Gun Run" halign="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="48.2923,9.511,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="4.43449,197.498,mm" type="65641" positionOnPage="4.43449,197.498,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31283,33 +32059,33 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem columnSpace="0" rasterBorder="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" title="" lineSpacing="2" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="10.096,10.8563,mm" type="65642" legendFilterByAtlas="0" symbolHeight="5" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frame="true" equalColumnWidth="0" itemRotation="0" zValue="6" background="true" symbolWidth="9" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" blendMode="0" opacity="1" position="10.096,10.8563,mm" positionLock="false" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" legendFilterByMap="1" size="59.0766,76,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="round" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
-        <FrameColor green="139" blue="139" alpha="255" red="139"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem wrapChar="" columnSpace="0" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="10.096,10.8563,mm" columnCount="1" opacity="1" frameJoinStyle="round" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" type="65642" outlineWidthM="0.3,mm" zValue="6" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="59.0766,76,mm" boxSpace="2" symbolWidth="9" minSymbolSize="0" position="10.096,10.8563,mm" frame="true" symbolHeight="5" title="" referencePoint="0" positionLock="false" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="0" lineSpacing="2" resizeToContents="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" itemRotation="0" rasterBorder="1" legendFilterByMap="1">
+        <FrameColor red="139" green="139" blue="139" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31317,52 +32093,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="subgroup">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2.5" indent="0" marginLeft="3" name="symbolLabel" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginLeft="3" marginTop="2.5" name="symbolLabel">
+            <styleFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" bold="0" underline="0" style="Regular" italic="0" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Ask Me" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Ask Me">
             <customproperties>
               <Option type="Map">
-                <Option name="legend/title-style" value="hidden" type="QString"/>
+                <Option value="hidden" type="QString" name="legend/title-style"/>
               </Option>
             </customproperties>
-            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" expanded="1" providerKey="ogr" name="poi_labels" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/label-0" value="Start/Finish" type="QString"/>
-                  <Option name="legend/label-1" value="Toilets" type="QString"/>
-                  <Option name="legend/label-2" value="Tog Bag Drop-off" type="QString"/>
-                  <Option name="legend/label-3" value="Road Closed to Cars" type="QString"/>
-                  <Option name="legend/label-4" value="MyCiti Drop-off" type="QString"/>
-                  <Option name="legend/label-5" value="Parking" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option value="Start/Finish" type="QString" name="legend/label-0"/>
+                  <Option value="Toilets" type="QString" name="legend/label-1"/>
+                  <Option value="Tog Bag Drop-off" type="QString" name="legend/label-2"/>
+                  <Option value="Road Closed to Cars" type="QString" name="legend/label-3"/>
+                  <Option value="MyCiti Drop-off" type="QString" name="legend/label-4"/>
+                  <Option value="Parking" type="QString" name="legend/label-5"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" expanded="1" providerKey="ogr" name="directions_to_start" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/label-0" value="To 21KM Start (06:30)" type="QString"/>
-                  <Option name="legend/label-1" value="To 10KM Start (07:30)" type="QString"/>
-                  <Option name="legend/label-2" value="To 5KM Start (08:30)" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option value="To 21KM Start (06:30)" type="QString" name="legend/label-0"/>
+                  <Option value="To 10KM Start (07:30)" type="QString" name="legend/label-1"/>
+                  <Option value="To 5KM Start (08:30)" type="QString" name="legend/label-2"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -31370,47 +32146,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem id="" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" halign="2" referencePoint="0" labelText="REVISION 1.0" marginX="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" position="221.862,190.027,mm" blendMode="0" opacity="1" size="27.7839,6.871,mm" positionLock="false" positionOnPage="221.862,190.027,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="5" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" labelText="REVISION 1.0" halign="2" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="27.7839,6.871,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="221.862,190.027,mm" type="65641" positionOnPage="221.862,190.027,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31425,65 +32201,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" position="197.975,197.498,mm" blendMode="0" opacity="1" size="51.6706,6.60801,mm" positionLock="false" positionOnPage="197.975,197.498,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="4" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="4" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" labelText="Sunday, 20 October 2019" halign="2" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="51.6706,6.60801,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="197.975,197.498,mm" type="65641" positionOnPage="197.975,197.498,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31498,39 +32274,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" referencePoint="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" position="249.646,179.724,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="24.3824" size="42.9838,24.3824,mm" positionLock="false" svgBorderWidth="0.2" northOffset="0" positionOnPage="249.646,179.724,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="24.2337" groupUuid="" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../Gun_Run_Logo.png" zValue="3" frame="false" positionLock="false" resizeMode="0" northOffset="0" pictureWidth="24.2337" id="" pictureHeight="24.3824" frameJoinStyle="miter" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgFillColor="255,255,255,255" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="42.9838,24.3824,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="249.646,179.724,mm" type="65640" anchorPoint="4" positionOnPage="249.646,179.724,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31538,42 +32314,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" referencePoint="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" position="4.58449,197.248,mm" blendMode="0" opacity="1" size="244.912,0.1,mm" positionLock="false" positionOnPage="4.58449,197.248,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="2" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="2" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" cornerRadiusMeasure="0,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="244.912,0.1,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="4.58449,197.248,mm" type="65643" positionOnPage="4.58449,197.248,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -31588,46 +32364,46 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem id="" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" referencePoint="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" position="4.43449,6.411,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="288.007,183.616,mm" mapFlags="0" positionLock="false" positionOnPage="4.43449,6.411,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Ask Me" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="false" positionLock="false" mapRotation="0" id="" frameJoinStyle="miter" isTemporal="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" followPresetName="Ask Me" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="288.007,183.616,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="4.43449,6.411,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="4.43449,6.411,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39762336729721071" xmax="18.41789384089274151" ymax="-33.8970204297764468" ymin="-33.90994364588821952"/>
+        <Extent ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmax="18.41789384089274151" xmin="18.39762336729721071"/>
         <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>
@@ -31642,45 +32418,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -31711,44 +32487,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -31771,40 +32547,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -31819,29 +32595,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31849,56 +32625,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="QString"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
-          <Option name="pdfTextFormat" value="0" type="QString"/>
-          <Option name="singleFile" value="true" type="QString"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="" sortFeatures="0" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" enabled="0" hideCoverage="0"/>
+      <Atlas sortFeatures="0" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" enabled="0" hideCoverage="0" pageNameExpression=""/>
     </Layout>
-    <Layout worldFileMap="" printResolution="144" name="Routes" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" units="mm" name="Routes" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -31913,49 +32689,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" referencePoint="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -31970,59 +32746,59 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" units="mm" page="0" orientation="2"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem id="" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" halign="2" referencePoint="0" labelText="REVISION 3.2" marginX="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" position="200.171,199.082,mm" blendMode="0" opacity="1" size="61.5373,6.8714,mm" positionLock="true" positionOnPage="200.171,199.082,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="13" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="13" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" labelText="REVISION 3.2" halign="2" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="61.5373,6.8714,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="200.171,199.082,mm" type="65641" positionOnPage="200.171,199.082,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32037,65 +32813,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" halign="1" referencePoint="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" marginX="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" position="9.7863,192.073,mm" blendMode="0" opacity="1" size="61.5373,6.60801,mm" positionLock="true" positionOnPage="9.7863,192.073,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="12" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="12" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" labelText="Gun Run 2022: [%&quot;Source&quot;%]" halign="1" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="61.5373,6.60801,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="9.7863,192.073,mm" type="65641" positionOnPage="9.7863,192.073,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32110,65 +32886,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" halign="1" referencePoint="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" marginX="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" position="9.7863,199.082,mm" blendMode="0" opacity="1" size="61.5373,6.60801,mm" positionLock="true" positionOnPage="9.7863,199.082,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="11" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="11" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" halign="1" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="61.5373,6.60801,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="9.7863,199.082,mm" type="65641" positionOnPage="9.7863,199.082,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32183,39 +32959,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" referencePoint="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" position="262.196,188.218,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="15.9472" size="29.7523,17.4718,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="262.196,188.218,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_250.png" pictureWidth="29.7523" groupUuid="" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="10" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../GunRun2022_250.png" zValue="10" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="29.7523" id="" pictureHeight="15.9472" frameJoinStyle="miter" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgFillColor="255,255,255,255" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="29.7523,17.4718,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="262.196,188.218,mm" type="65640" anchorPoint="4" positionOnPage="262.196,188.218,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32223,42 +32999,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" referencePoint="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" position="9.57644,198.832,mm" blendMode="0" opacity="1" size="251.982,0.1,mm" positionLock="true" positionOnPage="9.57644,198.832,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="9" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="9" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" cornerRadiusMeasure="0,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="251.982,0.1,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="9.57644,198.832,mm" type="65643" positionOnPage="9.57644,198.832,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -32273,321 +33049,321 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem id="Trail Finish" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" referencePoint="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" position="9.57644,5.42566,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="107.861,186.385,mm" mapFlags="0" positionLock="true" positionOnPage="9.57644,5.42566,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="8" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="8" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Trail Finish" frameJoinStyle="miter" isTemporal="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.3,mm" size="107.861,186.385,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="9.57644,5.42566,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="9.57644,5.42566,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39314911415855391" xmax="18.41187375074135701" ymax="-33.90007566747966905" ymin="-33.93243205975926458"/>
+        <Extent ymin="-33.93243205975926458" ymax="-33.90007566747966905" xmax="18.41187375074135701" xmin="18.39314911415855391"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Trail Start" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" referencePoint="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" position="112.643,4.09761,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="179.156,189.279,mm" mapFlags="0" positionLock="true" positionOnPage="112.643,4.09761,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="7" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="7" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Trail Start" frameJoinStyle="miter" isTemporal="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.3,mm" size="179.156,189.279,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="112.643,4.09761,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="112.643,4.09761,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3924263991010406" xmax="18.42354248737832023" ymax="-33.92484901666441743" ymin="-33.95772328900195447"/>
+        <Extent ymin="-33.95772328900195447" ymax="-33.92484901666441743" xmax="18.42354248737832023" xmin="18.3924263991010406"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Left inset 21KM" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" referencePoint="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" position="5.86559,4.09761,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="67.7828,166.874,mm" mapFlags="0" positionLock="true" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="6" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="6" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Left inset 21KM" frameJoinStyle="miter" isTemporal="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="67.7828,166.874,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="5.86559,4.09761,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMax">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMax">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37399999999999878" xmax="18.38626092146919788" ymax="-33.91681492292400435" ymin="-33.94700000000000273"/>
+        <Extent ymin="-33.94700000000000273" ymax="-33.91681492292400435" xmax="18.38626092146919788" xmin="18.37399999999999878"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Bottom inset 21KM" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" referencePoint="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="133.191,119.125,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="113.3,76.1023,mm" mapFlags="0" positionLock="true" positionOnPage="133.191,119.125,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="5" type="65639">
-        <FrameColor green="34" blue="144" alpha="255" red="103"/>
-        <BackgroundColor green="175" blue="215" alpha="255" red="200"/>
+      <LayoutItem zValue="5" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Bottom inset 21KM" frameJoinStyle="miter" isTemporal="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.3,mm" size="113.3,76.1023,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="133.191,119.125,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="133.191,119.125,mm" keepLayerSet="false">
+        <FrameColor red="103" green="34" blue="144" alpha="255"/>
+        <BackgroundColor red="200" green="175" blue="215" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41509620662891678" xmax="18.42329132157224336" ymax="-33.91132718340826813" ymin="-33.9168317482614512"/>
+        <Extent ymin="-33.9168317482614512" ymax="-33.91132718340826813" xmax="18.42329132157224336" xmin="18.41509620662891678"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="0" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="End inset Trail" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" referencePoint="0" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" position="19.6693,7.89412,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="68.3676,117.12,mm" mapFlags="0" positionLock="true" positionOnPage="19.6693,7.89412,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="4" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="4" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="End inset Trail" frameJoinStyle="miter" isTemporal="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.3,mm" size="68.3676,117.12,mm" excludeFromExports="0" visibility="0" blendMode="0" opacity="1" groupUuid="" position="19.6693,7.89412,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="19.6693,7.89412,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.4044900556177744" xmax="18.41240136424316276" ymax="-33.90099106513847005" ymin="-33.91454383501641701"/>
+        <Extent ymin="-33.91454383501641701" ymax="-33.90099106513847005" xmax="18.41240136424316276" xmin="18.4044900556177744"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Start inset Trail" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" referencePoint="0" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" position="170.062,49.6297,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="63.655,88.3012,mm" mapFlags="0" positionLock="true" positionOnPage="170.062,49.6297,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="3" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="3" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Start inset Trail" frameJoinStyle="miter" isTemporal="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.3,mm" size="63.655,88.3012,mm" excludeFromExports="0" visibility="0" blendMode="0" opacity="1" groupUuid="" position="170.062,49.6297,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="170.062,49.6297,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41445559427620893" xmax="18.4185691326545431" ymax="-33.94253141264477591" ymin="-33.94823764719958348"/>
+        <Extent ymin="-33.94823764719958348" ymax="-33.94253141264477591" xmax="18.4185691326545431" xmin="18.41445559427620893"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Contour inset Trail" uuid="{917a530c-14f4-4ed8-b109-961939435221}" referencePoint="0" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" position="200.321,125.314,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="75.8756,69.7635,mm" mapFlags="0" positionLock="true" positionOnPage="200.321,125.314,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="2" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="2" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="Contour inset Trail" frameJoinStyle="miter" isTemporal="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.3,mm" size="75.8756,69.7635,mm" excludeFromExports="0" visibility="0" blendMode="0" opacity="1" groupUuid="" position="200.321,125.314,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="200.321,125.314,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41234259163472942" xmax="18.42332635419156972" ymax="-33.94692690566557047" ymin="-33.95702588572736147"/>
+        <Extent ymin="-33.95702588572736147" ymax="-33.94692690566557047" xmax="18.42332635419156972" xmin="18.41234259163472942"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="Main Map" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" referencePoint="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" position="9.50144,5.50066,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="282.372,186.105,mm" mapFlags="0" positionLock="false" positionOnPage="9.50144,5.50066,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="round" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.15,mm" frame="true" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="true" positionLock="false" mapRotation="0" id="Main Map" frameJoinStyle="round" isTemporal="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" followPresetName="Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="true" outlineWidthM="0.15,mm" size="282.372,186.105,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="9.50144,5.50066,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="9.50144,5.50066,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36400000000000077" xmax="18.45389078049076304" ymax="-33.89975491900725046" ymin="-33.95900000000000318"/>
+        <Extent ymin="-33.95900000000000318" ymax="-33.89975491900725046" xmax="18.45389078049076304" xmin="18.36400000000000077"/>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -32618,44 +33394,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -32678,40 +33454,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -32726,29 +33502,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32756,34 +33532,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" show="1" inverted="0" name="Overview 1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" centered="0">
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <ComposerMapOverview blendMode="0" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="3" centered="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" name="Overview 1" inverted="0">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
-                <Option name="properties" type="Map">
-                  <Option name="alpha" type="Map">
-                    <Option name="active" value="true" type="bool"/>
-                    <Option name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString"/>
-                    <Option name="type" value="3" type="int"/>
+                <Option value="" type="QString" name="name"/>
+                <Option type="Map" name="properties">
+                  <Option type="Map" name="alpha">
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
                 </Option>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="103,34,144,26" 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="103,34,144,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="103,34,144,26" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="103,34,144,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="103,34,144,26" k="color"/>
@@ -32798,9 +33574,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32808,9 +33584,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32818,63 +33594,63 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.06"/>
+        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="int"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfAppendGeoreference" value="1" type="int"/>
-          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
-          <Option name="pdfExportThemes" value="" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="int"/>
-          <Option 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~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString"/>
-          <Option name="pdfLosslessImages" value="0" type="int"/>
-          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
-          <Option name="pdfSimplify" value="1" type="int"/>
-          <Option name="pdfTextFormat" value="0" type="int"/>
-          <Option name="singleFile" value="true" type="QString"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="int" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="1" type="int" name="pdfAppendGeoreference"/>
+          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="int" name="pdfIncludeMetadata"/>
+          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString" name="pdfLayerOrder"/>
+          <Option value="0" type="int" name="pdfLosslessImages"/>
+          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="int" name="pdfSimplify"/>
+          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="1" pageNameExpression="&quot;Distance&quot;" sortKey="&quot;Sort&quot;" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" enabled="1" hideCoverage="0" coverageLayerName="all_routes"/>
+      <Atlas sortFeatures="1" sortKey="&quot;Sort&quot;" filterFeatures="1" coverageLayerName="all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerProvider="ogr" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortAscending="1" enabled="1" hideCoverage="0" pageNameExpression="&quot;Distance&quot;"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="120" name="Marshal Plan A1" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="120" units="mm" name="Marshal Plan A1" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -32889,49 +33665,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" referencePoint="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" position="0,0,mm" blendMode="0" opacity="1" size="594,841,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="594,841,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -32946,9 +33722,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32956,15 +33732,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="25.5925,18.7971,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frame="false" equalColumnWidth="1" itemRotation="0" zValue="8" background="true" symbolWidth="7" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" blendMode="0" opacity="1" position="25.5925,18.7971,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="4,4,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem wrapChar="" columnSpace="2" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="25.5925,18.7971,mm" columnCount="1" opacity="1" frameJoinStyle="miter" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" type="65642" outlineWidthM="0.3,mm" zValue="8" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="4,4,mm" boxSpace="2" symbolWidth="7" minSymbolSize="0" position="25.5925,18.7971,mm" frame="false" symbolHeight="4" title="" referencePoint="0" positionLock="true" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="1" lineSpacing="1" resizeToContents="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" itemRotation="0" rasterBorder="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32972,37 +33748,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="1" indent="0" name="subgroup" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="1" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" name="symbol" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginTop="2" name="symbol">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" id="all_routes20170907054841602" patch_size="0,0" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="all_routes20170907054841602" legend_exp="" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString"/>
-                  <Option name="legend/node-order" value="1,2,3" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
-                  <Option name="showFeatureCount" value="0" type="QString"/>
+                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString" name="expandedLegendNodes"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option value="0" type="QString" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33010,47 +33786,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem id="" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" halign="1" referencePoint="0" labelText="MARSHAL POSITIONS" marginX="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" position="5.2963,808.939,mm" blendMode="0" opacity="1" size="91.9494,15.0649,mm" positionLock="true" positionOnPage="5.2963,808.939,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="7" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="7" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" labelText="MARSHAL POSITIONS" halign="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="91.9494,15.0649,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="5.2963,808.939,mm" type="65641" positionOnPage="5.2963,808.939,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="63" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33065,65 +33841,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" halign="2" referencePoint="0" labelText="REVISION 1.2" marginX="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" position="430.403,825.052,mm" blendMode="0" opacity="1" size="56.6212,15.3656,mm" positionLock="true" positionOnPage="430.403,825.052,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="5" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" labelText="REVISION 1.2" halign="2" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="56.6212,15.3656,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="430.403,825.052,mm" type="65641" positionOnPage="430.403,825.052,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33138,65 +33914,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{d177957c-7ab6-40ae-8769-347428500538}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" position="372.175,808.942,mm" blendMode="0" opacity="1" size="114.848,15.0635,mm" positionLock="true" positionOnPage="372.175,808.942,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="4" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="4" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{d177957c-7ab6-40ae-8769-347428500538}" labelText="Sunday, 20 October 2019" halign="2" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="114.848,15.0635,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="372.175,808.942,mm" type="65641" positionOnPage="372.175,808.942,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33211,39 +33987,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" referencePoint="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" position="489.557,775.395,mm" anchorPoint="8" blendMode="0" opacity="1" pictureHeight="63.9757" size="100.498,63.9757,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="489.557,775.395,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="63.5856" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../Gun_Run_Logo.png" zValue="3" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="63.5856" id="" pictureHeight="63.9757" frameJoinStyle="miter" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgFillColor="255,255,255,255" mapUuid="" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="100.498,63.9757,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="489.557,775.395,mm" type="65640" anchorPoint="8" positionOnPage="489.557,775.395,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33251,42 +34027,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" referencePoint="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" position="5.4463,824.155,mm" blendMode="0" opacity="1" size="481.428,0.606138,mm" positionLock="true" positionOnPage="5.4463,824.155,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="2" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="2" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" cornerRadiusMeasure="0,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="481.428,0.606138,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="5.4463,824.155,mm" type="65643" positionOnPage="5.4463,824.155,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -33301,90 +34077,90 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem id="" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" referencePoint="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" position="3.94474,5.25965,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="584.759,811.213,mm" mapFlags="0" positionLock="true" positionOnPage="3.94474,5.25965,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal overview" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="" frameJoinStyle="miter" isTemporal="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" followPresetName="Marshal plan" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="584.759,811.213,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="3.94474,5.25965,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="3.94474,5.25965,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37434415142052657" xmax="18.42299397558693741" ymax="-33.89072661913806428" ymin="-33.95821655848814657"/>
+        <Extent ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmax="18.42299397558693741" xmin="18.37434415142052657"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0"/>
+        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="QString"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
-          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortFeatures="1" coverageLayerProvider="virtual" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;page&quot;" sortKey="page" enabled="1" hideCoverage="1" coverageLayerName="complete_marshal_overview"/>
+      <Atlas sortFeatures="1" sortKey="page" filterFeatures="0" coverageLayerName="complete_marshal_overview" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="virtual" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortAscending="1" enabled="1" hideCoverage="1" pageNameExpression="&quot;page&quot;"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="144" name="Access Roads" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" units="mm" name="Access Roads" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -33399,49 +34175,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" referencePoint="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -33456,27 +34232,27 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" units="mm" page="0" orientation="2"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="244.484,130.172,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" frame="true" equalColumnWidth="0" itemRotation="0" zValue="15" background="true" symbolWidth="7" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" blendMode="0" opacity="1" position="244.484,130.172,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="34.45,40.8,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="185" red="255"/>
+      <LayoutItem wrapChar="" columnSpace="2" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="244.484,130.172,mm" columnCount="1" opacity="1" frameJoinStyle="miter" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" type="65642" outlineWidthM="0.3,mm" zValue="15" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="34.45,40.8,mm" boxSpace="2" symbolWidth="7" minSymbolSize="0" position="244.484,130.172,mm" frame="true" symbolHeight="4" title="" referencePoint="0" positionLock="true" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="0" lineSpacing="1" resizeToContents="1" itemRotation="0" rasterBorder="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="185"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33484,35 +34260,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="3" indent="0" name="group" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="3" name="group">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="3" indent="0" name="subgroup" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="3" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" underline="0" style="Regular" italic="0" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Residents Access" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Residents Access">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" expanded="1" providerKey="ogr" name="residents_access_roads" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33520,47 +34296,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem id="" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" halign="1" referencePoint="0" labelText="ACCESS ROUTES FOR RESIDENTS" marginX="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" position="9.37446,191.81,mm" blendMode="0" opacity="1" size="194.851,7.272,mm" positionLock="true" positionOnPage="9.37446,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="8" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="8" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" labelText="ACCESS ROUTES FOR RESIDENTS" halign="1" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="194.851,7.272,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="9.37446,191.81,mm" type="65641" positionOnPage="9.37446,191.81,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="14" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="14" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33575,65 +34351,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" halign="2" referencePoint="0" labelText="REVISION 1.1" marginX="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" position="204.225,191.81,mm" blendMode="0" opacity="1" size="57.4836,6.8714,mm" positionLock="true" positionOnPage="204.225,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="6" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="6" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" labelText="REVISION 1.1" halign="2" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="57.4836,6.8714,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="204.225,191.81,mm" type="65641" positionOnPage="204.225,191.81,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33648,65 +34424,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" position="210.038,199.082,mm" blendMode="0" opacity="1" size="51.6706,6.60801,mm" positionLock="true" positionOnPage="210.038,199.082,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="5" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="5" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" labelText="Sunday, 20 October 2019" halign="2" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="51.6706,6.60801,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="210.038,199.082,mm" type="65641" positionOnPage="210.038,199.082,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33721,39 +34497,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" referencePoint="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" position="262.196,188.218,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="17.4718" size="29.7523,17.4718,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="262.196,188.218,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="17.3653" groupUuid="" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../Gun_Run_Logo.png" zValue="4" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="17.3653" id="" pictureHeight="17.4718" frameJoinStyle="miter" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgFillColor="255,255,255,255" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="29.7523,17.4718,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="262.196,188.218,mm" type="65640" anchorPoint="4" positionOnPage="262.196,188.218,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33761,42 +34537,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" referencePoint="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" position="9.59946,198.832,mm" blendMode="0" opacity="1" size="251.959,0.1,mm" positionLock="true" positionOnPage="9.59946,198.832,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="3" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" cornerRadiusMeasure="0,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="251.959,0.1,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="9.59946,198.832,mm" type="65643" positionOnPage="9.59946,198.832,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -33811,61 +34587,61 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem id="" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" referencePoint="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" position="5.86559,4.09761,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="67.7828,166.874,mm" mapFlags="0" positionLock="true" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Access Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="2" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="2" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="" frameJoinStyle="miter" isTemporal="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" followPresetName="Access Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="67.7828,166.874,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="5.86559,4.09761,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMax">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMax">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="type" value="1" type="int"/>
-                  <Option name="val" value="" type="QString"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" xmax="18.38563681624126289" ymax="-33.91513741583252539" ymin="-33.94652930000000168"/>
+        <Extent ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121"/>
         <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>
@@ -33880,45 +34656,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -33949,44 +34725,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -34009,40 +34785,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -34057,29 +34833,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34087,45 +34863,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem id="" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" referencePoint="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" position="9.44946,9.08557,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="282.012,175.592,mm" mapFlags="0" positionLock="true" positionOnPage="9.44946,9.08557,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="round" visibility="1" drawCanvasItems="false" followPresetName="Access Routes" outlineWidthM="0.15,mm" frame="true" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="true" positionLock="true" mapRotation="0" id="" frameJoinStyle="round" isTemporal="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" followPresetName="Access Routes" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.15,mm" size="282.012,175.592,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="9.44946,9.08557,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="9.44946,9.08557,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" xmax="18.42303507276415431" ymax="-33.89697816224119009" ymin="-33.92999999999999972"/>
+        <Extent ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmax="18.42303507276415431" xmin="18.37000000000000099"/>
         <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>
@@ -34140,45 +34916,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -34209,44 +34985,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -34269,40 +35045,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -34317,29 +35093,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34347,56 +35123,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="QString"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
-          <Option name="pdfTextFormat" value="0" type="QString"/>
-          <Option name="singleFile" value="false" type="QString"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="false" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" enabled="1" hideCoverage="1" coverageLayerName="residents_access"/>
+      <Atlas sortFeatures="0" filterFeatures="0" coverageLayerName="residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="1" hideCoverage="1" pageNameExpression="&quot;FID&quot;"/>
     </Layout>
-    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" printResolution="144" name="Golf Course Access" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="144" units="mm" name="Golf Course Access" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -34411,49 +35187,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" referencePoint="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -34468,59 +35244,59 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" units="mm" page="0" orientation="2"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem id="" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" halign="1" referencePoint="0" labelText="Access to P9 Parking and VIP Tent" marginX="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" position="9.37446,191.81,mm" blendMode="0" opacity="1" size="194.851,7.272,mm" positionLock="true" positionOnPage="9.37446,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="8" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="8" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" labelText="Access to P9 Parking and VIP Tent" halign="1" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="194.851,7.272,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="9.37446,191.81,mm" type="65641" positionOnPage="9.37446,191.81,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="14" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="14" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34535,65 +35311,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" halign="2" referencePoint="0" labelText="REVISION 1.0" marginX="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" position="204.225,191.81,mm" blendMode="0" opacity="1" size="57.4836,6.8714,mm" positionLock="true" positionOnPage="204.225,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="6" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="6" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" labelText="REVISION 1.0" halign="2" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="57.4836,6.8714,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="204.225,191.81,mm" type="65641" positionOnPage="204.225,191.81,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34608,65 +35384,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" position="210.038,199.082,mm" blendMode="0" opacity="1" size="51.6706,6.60801,mm" positionLock="true" positionOnPage="210.038,199.082,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="5" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="5" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" labelText="Sunday, 20 October 2019" halign="2" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="51.6706,6.60801,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="1" opacity="1" groupUuid="" position="210.038,199.082,mm" type="65641" positionOnPage="210.038,199.082,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34681,39 +35457,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" referencePoint="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" position="262.196,188.218,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="17.4718" size="29.7523,17.4718,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="262.196,188.218,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="17.3653" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../Gun_Run_Logo.png" zValue="4" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="17.3653" id="" pictureHeight="17.4718" frameJoinStyle="miter" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgFillColor="255,255,255,255" mapUuid="" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="29.7523,17.4718,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="262.196,188.218,mm" type="65640" anchorPoint="4" positionOnPage="262.196,188.218,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34721,42 +35497,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" referencePoint="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" position="9.59946,198.832,mm" blendMode="0" opacity="1" size="251.959,0.1,mm" positionLock="true" positionOnPage="9.59946,198.832,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="3" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" cornerRadiusMeasure="0,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="251.959,0.1,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="9.59946,198.832,mm" type="65643" positionOnPage="9.59946,198.832,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -34771,46 +35547,46 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem id="" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" referencePoint="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" position="9.44946,7.25098,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="282.012,182.649,mm" mapFlags="0" positionLock="false" positionOnPage="9.44946,7.25098,mm" keepLayerSet="false" groupUuid="" followPreset="false" excludeFromExports="0" background="true" frameJoinStyle="round" visibility="1" drawCanvasItems="false" followPresetName="" outlineWidthM="0.15,mm" frame="false" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="false" positionLock="false" mapRotation="0" id="" frameJoinStyle="round" isTemporal="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" followPresetName="" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.15,mm" size="282.012,182.649,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="9.44946,7.25098,mm" type="65639" followPreset="false" labelMargin="0,mm" positionOnPage="9.44946,7.25098,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="true" type="bool"/>
-                  <Option 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" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40103928699269886" xmax="18.40919746780259914" ymax="-33.90319854486631357" ymin="-33.90848231674397084"/>
+        <Extent ymin="-33.90848231674397084" ymax="-33.90319854486631357" xmax="18.40919746780259914" xmin="18.40103928699269886"/>
         <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>
@@ -34825,45 +35601,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid rightAnnotationDisplay="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="0" gridFrameMargin="0" annotationFormat="0" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" annotationExpression="" intervalY="0" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
           <lineStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
                 <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="0,0,0,255" type="QString"/>
-                  <Option name="line_style" value="solid" type="QString"/>
-                  <Option name="line_width" value="0" 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 value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -34894,44 +35670,44 @@ 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 value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" value="0" type="QString"/>
-                  <Option name="cap_style" value="square" type="QString"/>
-                  <Option name="color" value="0,0,0,255" type="QString"/>
-                  <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="name" value="circle" 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="0,0,0,255" type="QString"/>
-                  <Option name="outline_style" value="solid" type="QString"/>
-                  <Option name="outline_width" value="0" 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="2" 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 value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -34954,40 +35730,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                    <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                    <Option name="outline_style" value="no" type="QString"/>
-                    <Option name="outline_width" value="0" type="QString"/>
-                    <Option name="outline_width_unit" value="MM" type="QString"/>
-                    <Option name="style" value="solid" type="QString"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -35002,29 +35778,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" value="" type="QString"/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" value="collection" type="QString"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35032,56 +35808,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="QString"/>
-          <Option name="imageAntialias" value="true" type="QString"/>
-          <Option name="imageCropMarginBottom" value="0" type="QString"/>
-          <Option name="imageCropMarginLeft" value="0" type="QString"/>
-          <Option name="imageCropMarginRight" value="0" type="QString"/>
-          <Option name="imageCropMarginTop" value="0" type="QString"/>
-          <Option name="imageCropToContents" value="false" type="QString"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
-          <Option name="pdfTextFormat" value="0" type="QString"/>
-          <Option name="singleFile" value="false" type="QString"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="false" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" enabled="0" hideCoverage="1" coverageLayerName="residents_access"/>
+      <Atlas sortFeatures="0" filterFeatures="0" coverageLayerName="residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="0" hideCoverage="1" pageNameExpression="&quot;FID&quot;"/>
     </Layout>
-    <Layout worldFileMap="" printResolution="120" name="Marshal Plan" units="mm">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
+    <Layout printResolution="120" units="mm" name="Marshal Plan" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
       <PageCollection>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="255,255,255,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="no" type="QString"/>
-              <Option name="outline_width" value="0.26" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -35096,49 +35872,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem id="" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" referencePoint="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" position="0,0,mm" blendMode="0" opacity="1" size="297,420,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
-          <FrameColor green="0" blue="0" alpha="255" red="0"/>
-          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,420,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="255,255,255,255" type="QString"/>
-                <Option name="joinstyle" value="miter" 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="35,35,35,255" type="QString"/>
-                <Option name="outline_style" value="no" type="QString"/>
-                <Option name="outline_width" value="0.26" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -35153,9 +35929,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35163,47 +35939,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem id="" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" halign="4" referencePoint="0" labelText="Page [% &quot;page&quot; %] " marginX="0" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" position="112.086,406.476,mm" blendMode="0" opacity="1" size="23.5967,8.3142,mm" positionLock="true" positionOnPage="112.086,406.476,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="9" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="9" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" labelText="Page [% &quot;page&quot; %] " halign="4" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" marginY="1" htmlState="1" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="23.5967,8.3142,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="112.086,406.476,mm" type="65641" positionOnPage="112.086,406.476,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35218,65 +35994,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" halign="2" referencePoint="0" labelText="REVISION 4.1" marginX="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" position="214.292,406.874,mm" blendMode="0" opacity="1" size="27.7839,7.51682,mm" positionLock="true" positionOnPage="214.292,406.874,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="8" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="8" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" labelText="REVISION 4.1" halign="2" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="27.7839,7.51682,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="214.292,406.874,mm" type="65641" positionOnPage="214.292,406.874,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35291,33 +36067,33 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="15.6525,12.5708,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frame="false" equalColumnWidth="1" itemRotation="0" zValue="7" background="true" symbolWidth="7" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" blendMode="0" opacity="1" position="15.6525,12.5708,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="21.6797,33,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem wrapChar="" columnSpace="2" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="15.6525,12.5708,mm" columnCount="1" opacity="1" frameJoinStyle="miter" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" type="65642" outlineWidthM="0.3,mm" zValue="7" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="21.6797,33,mm" boxSpace="2" symbolWidth="7" minSymbolSize="0" position="15.6525,12.5708,mm" frame="false" symbolHeight="4" title="" referencePoint="0" positionLock="true" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="1" lineSpacing="1" resizeToContents="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" itemRotation="0" rasterBorder="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35325,37 +36101,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="1" indent="0" name="subgroup" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginTop="1" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" name="symbol" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <style indent="0" alignment="1" marginTop="2" name="symbol">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
           </style>
-          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
-            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
+          <style indent="0" alignment="1" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
-                  <Option name="legend/title-style" value="hidden" type="QString"/>
-                  <Option name="showFeatureCount" value="0" type="int"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option value="0" type="int" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -35363,47 +36139,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem id="" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" halign="1" referencePoint="0" labelText="MARSHAL POSITIONS" marginX="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" position="5.69321,398.344,mm" blendMode="0" opacity="1" size="45.1194,8.13137,mm" positionLock="true" positionOnPage="5.69321,398.344,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="6" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="6" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" labelText="MARSHAL POSITIONS" halign="1" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="45.1194,8.13137,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="5.69321,398.344,mm" type="65641" positionOnPage="5.69321,398.344,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="63" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35418,65 +36194,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" halign="1" referencePoint="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" marginX="0" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" position="5.69321,406.988,mm" blendMode="0" opacity="1" size="118.192,7.80192,mm" positionLock="true" positionOnPage="5.69321,406.988,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="5" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" halign="1" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" marginY="1" htmlState="1" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="118.192,7.80192,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="5.69321,406.988,mm" type="65641" positionOnPage="5.69321,406.988,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35491,65 +36267,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" halign="2" referencePoint="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" marginX="0" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" position="148.501,398.344,mm" blendMode="0" opacity="1" size="93.5757,8.13167,mm" positionLock="true" positionOnPage="148.501,398.344,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="4" type="65641">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="4" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" halign="2" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" marginY="1" htmlState="1" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="93.5757,8.13167,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="148.501,398.344,mm" type="65641" positionOnPage="148.501,398.344,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
-          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
-            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,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="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35564,39 +36340,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem id="" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" referencePoint="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" position="243.319,382.696,mm" anchorPoint="8" blendMode="0" opacity="1" pictureHeight="26.4325" size="49.3143,31.2967,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="243.319,382.696,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_250.png" pictureWidth="49.3143" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65640">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem file="../GunRun2022_250.png" zValue="3" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="49.3143" id="" pictureHeight="26.4325" frameJoinStyle="miter" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgFillColor="255,255,255,255" mapUuid="" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="49.3143,31.2967,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="243.319,382.696,mm" type="65640" anchorPoint="8" positionOnPage="243.319,382.696,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="expression" value="" type="QString"/>
-                  <Option name="type" value="3" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35604,42 +36380,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem id="" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" referencePoint="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" position="5.84321,406.626,mm" blendMode="0" opacity="1" size="236.083,0.14328,mm" positionLock="true" positionOnPage="5.84321,406.626,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="2" type="65643">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="2" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" cornerRadiusMeasure="0,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="236.083,0.14328,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="5.84321,406.626,mm" type="65643" positionOnPage="5.84321,406.626,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-              <Option name="color" value="0,0,0,255" type="QString"/>
-              <Option name="joinstyle" value="miter" 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="0,0,0,255" type="QString"/>
-              <Option name="outline_style" value="solid" type="QString"/>
-              <Option name="outline_width" value="0.3" type="QString"/>
-              <Option name="outline_width_unit" value="MM" type="QString"/>
-              <Option name="style" value="solid" type="QString"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -35654,78 +36430,1479 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem id="" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" referencePoint="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" position="5.03,5.9483,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="286.94,392.396,mm" mapFlags="0" positionLock="true" positionOnPage="5.03,5.9483,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal overview" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
-        <FrameColor green="0" blue="0" alpha="255" red="0"/>
-        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
+      <LayoutItem zValue="1" mapFlags="0" frame="false" positionLock="true" mapRotation="0" id="" frameJoinStyle="miter" isTemporal="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" followPresetName="Marshal plan" background="true" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="286.94,392.396,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="5.03,5.9483,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="5.03,5.9483,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" value="false" type="bool"/>
-                  <Option name="field" value="" type="QString"/>
-                  <Option name="type" value="2" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" value="collection" type="QString"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40977343001242872" xmax="18.42666503715575743" ymax="-33.89590406990863158" ymin="-33.91900367262346094"/>
+        <Extent ymin="-33.94797288016832226" ymax="-33.9248732774534929" xmax="18.38613924055453452" xmin="18.36924763341120581"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="1" scalingMode="2" margin="0"/>
+        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" value="png" type="QString"/>
-          <Option name="forceVector" value="0" type="int"/>
-          <Option name="pdfAppendGeoreference" value="1" type="int"/>
-          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
-          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
-          <Option name="pdfExportThemes" value="" type="QString"/>
-          <Option name="pdfIncludeMetadata" value="1" type="int"/>
-          <Option 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~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString"/>
-          <Option name="pdfLosslessImages" value="0" type="int"/>
-          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
-          <Option name="pdfSimplify" value="1" type="int"/>
-          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="int" name="forceVector"/>
+          <Option value="1" type="int" name="pdfAppendGeoreference"/>
+          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="int" name="pdfIncludeMetadata"/>
+          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="QString" name="pdfLayerOrder"/>
+          <Option value="0" type="int" name="pdfLosslessImages"/>
+          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="int" name="pdfSimplify"/>
+          <Option value="0" type="int" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;page&quot;" sortKey="page" enabled="1" hideCoverage="1" coverageLayerName="marshal_overviews"/>
+      <Atlas sortFeatures="1" sortKey="page" filterFeatures="0" coverageLayerName="marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="ogr" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortAscending="1" enabled="1" hideCoverage="1" pageNameExpression="&quot;page&quot;"/>
+    </Layout>
+    <Layout printResolution="300" units="mm" name="Fencing - Cones only" worldFileMap="">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetUnits="mm" resolution="10" offsetY="0" offsetX="0"/>
+      <PageCollection>
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <Option type="Map">
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
+            </Option>
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="255,255,255,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.26" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+          </layer>
+        </symbol>
+        <LayoutItem zValue="0" frame="false" positionLock="false" id="" frameJoinStyle="miter" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" background="true" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="297,210,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" position="0,0,mm" type="65638" positionOnPage="0,0,mm">
+          <FrameColor red="0" green="0" blue="0" alpha="255"/>
+          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+          <LayoutObject>
+            <dataDefinedProperties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </dataDefinedProperties>
+            <customproperties>
+              <Option/>
+            </customproperties>
+          </LayoutObject>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
+              </Option>
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="miter" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </LayoutItem>
+        <GuideCollection visible="1"/>
+      </PageCollection>
+      <LayoutItem wrapChar="" columnSpace="2" legendFilterByAtlas="0" splitLayer="0" groupUuid="" wmsLegendHeight="25" background="true" positionOnPage="256.808,5.21277,mm" columnCount="1" opacity="1" frameJoinStyle="miter" blendMode="0" rasterBorderWidth="0" fontColor="#000000" titleAlignment="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" type="65642" outlineWidthM="0.3,mm" zValue="11" wmsLegendWidth="50" maxSymbolSize="0" symbolAlignment="1" excludeFromExports="0" id="" size="38.1563,53.7608,mm" boxSpace="2" symbolWidth="7" minSymbolSize="0" position="256.808,5.21277,mm" frame="true" symbolHeight="4" title="" referencePoint="0" positionLock="true" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" visibility="1" rasterBorderColor="0,0,0,255" equalColumnWidth="1" lineSpacing="1" resizeToContents="0" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" itemRotation="0" rasterBorder="1">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <styles>
+          <style indent="0" alignment="1" name="title">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" bold="1" underline="0" style="Bold" italic="0" strikethrough="0"/>
+          </style>
+          <style indent="0" alignment="1" marginTop="3" name="group">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
+          </style>
+          <style indent="0" alignment="1" marginTop="3" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" bold="1" underline="0" style="Semibold" italic="0" strikethrough="0"/>
+          </style>
+          <style indent="0" alignment="1" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0" underline="0" style="" italic="0" strikethrough="0"/>
+          </style>
+          <style indent="0" alignment="1" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0" underline="0" style="Regular" italic="0" strikethrough="0"/>
+          </style>
+        </styles>
+        <layer-tree-group>
+          <customproperties>
+            <Option/>
+          </customproperties>
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Fencing and Cones">
+            <customproperties>
+              <Option/>
+            </customproperties>
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="fencing" source="./fencing.shp|layername=fencing">
+              <customproperties>
+                <Option type="Map">
+                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
+                  <Option value="" type="QString" name="legend/expressionFilter"/>
+                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+                  <Option value="1,4" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                </Option>
+              </customproperties>
+            </layer-tree-layer>
+          </layer-tree-group>
+          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+            <customproperties>
+              <Option/>
+            </customproperties>
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" providerKey="ogr" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
+              <customproperties>
+                <Option type="Map">
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option value="0" type="int" name="showFeatureCount"/>
+                </Option>
+              </customproperties>
+            </layer-tree-layer>
+          </layer-tree-group>
+          <custom-order enabled="0"/>
+        </layer-tree-group>
+      </LayoutItem>
+      <LayoutItem zValue="10" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" labelText="CONES: [% &quot;name&quot; %]" halign="1" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="148.46,6.45211,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="6.76779,191.188,mm" type="65641" positionOnPage="6.76779,191.188,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="63" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem zValue="9" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" halign="2" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" marginY="0" htmlState="1" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="56.3557,6.45237,mm" valign="64" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="182.723,191.188,mm" type="65641" positionOnPage="182.723,191.188,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem zValue="8" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" labelText="REVISION 2.1" halign="2" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="26.8205,6.82826,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="209.146,198.083,mm" type="65641" positionOnPage="209.146,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem zValue="7" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" halign="1" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" marginY="1" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="51.1638,7.07327,mm" valign="32" excludeFromExports="0" visibility="0" blendMode="0" marginX="1" opacity="1" groupUuid="" position="62.6706,198.083,mm" type="65641" positionOnPage="62.6706,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem zValue="6" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" halign="1" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="64.7594,7.10512,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="116.805,198.083,mm" type="65641" positionOnPage="116.805,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem zValue="5" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" labelText="Page [% @atlas_featurenumber %]" halign="1" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" marginY="0" htmlState="0" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="90.2083,7.07327,mm" valign="32" excludeFromExports="0" visibility="1" blendMode="0" marginX="0" opacity="1" groupUuid="" position="6.76779,198.083,mm" type="65641" positionOnPage="6.76779,198.083,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem file="../GunRun2022_250.png" zValue="4" frame="false" positionLock="true" resizeMode="0" northOffset="0" pictureWidth="49.3143" id="" pictureHeight="26.4325" frameJoinStyle="miter" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" svgBorderWidth="0.2" pictureRotation="0" mode="1" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" svgFillColor="255,255,255,255" mapUuid="" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="49.3143,29.8354,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" svgBorderColor="0,0,0,255" northMode="0" position="243.098,175.353,mm" type="65640" anchorPoint="8" positionOnPage="243.098,175.353,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
+                </Option>
+              </Option>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutItem>
+      <LayoutItem zValue="3" frame="false" positionLock="true" id="" frameJoinStyle="miter" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" cornerRadiusMeasure="0,mm" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" background="false" referencePoint="0" itemRotation="0" outlineWidthM="0.3,mm" size="232.01,0.14328,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="1" groupUuid="" shapeType="1" position="6.91779,197.79,mm" type="65643" positionOnPage="6.91779,197.79,mm">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
+          <data_defined_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </data_defined_properties>
+          <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+            <Option type="Map">
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
+            </Option>
+            <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+            <prop v="0,0,0,255" k="color"/>
+            <prop v="miter" k="joinstyle"/>
+            <prop v="0,0" k="offset"/>
+            <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+            <prop v="MM" k="offset_unit"/>
+            <prop v="0,0,0,255" k="outline_color"/>
+            <prop v="solid" k="outline_style"/>
+            <prop v="0.3" k="outline_width"/>
+            <prop v="MM" k="outline_width_unit"/>
+            <prop v="solid" k="style"/>
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+          </layer>
+        </symbol>
+      </LayoutItem>
+      <LayoutItem numSubdivisions="1" groupUuid="" background="false" outlineWidth="0.2" lineJoinStyle="round" positionOnPage="6.76779,2.8482,mm" unitType="meters" labelHorizontalPlacement="0" unitLabel="m" opacity="1" numMapUnitsPerScaleBarUnit="1" frameJoinStyle="miter" blendMode="0" alignment="0" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" minBarWidth="25" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" type="65646" labelBarSpace="1" lineCapStyle="square" outlineWidthM="0.3,mm" zValue="2" excludeFromExports="0" id="" numSegmentsLeft="2" size="106.045,15.8378,mm" position="6.76779,2.8482,mm" labelVerticalPlacement="0" frame="false" numUnitsPerSegment="20" referencePoint="0" positionLock="true" height="2" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" numSegments="2" visibility="1" segmentMillimeters="32.0947" style="Double Box" subdivisionsHeight="1.5" itemRotation="0" maxBarWidth="100" segmentSizeMode="1" boxContentSpace="0.2">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="12" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+          <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
+                </Option>
+                <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                <prop v="255,255,255,255" k="color"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="128,128,128,255" k="outline_color"/>
+                <prop v="no" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="solid" k="style"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option name="properties"/>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+        <strokeColor red="0" green="0" blue="0" alpha="255"/>
+        <numericFormat id="basic">
+          <Option type="Map">
+            <Option value="" type="QChar" name="decimal_separator"/>
+            <Option value="6" type="int" name="decimals"/>
+            <Option value="0" type="int" name="rounding_type"/>
+            <Option value="false" type="bool" name="show_plus"/>
+            <Option value="true" type="bool" name="show_thousand_separator"/>
+            <Option value="false" type="bool" name="show_trailing_zeros"/>
+            <Option value="" type="QChar" name="thousand_separator"/>
+          </Option>
+        </numericFormat>
+        <fillColor red="0" green="0" blue="0" alpha="255"/>
+        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <lineSymbol>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+              </Option>
+              <prop v="0" k="align_dash_pattern"/>
+              <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"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="dash_pattern_offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+              <prop v="MM" k="dash_pattern_offset_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="trim_distance_end"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_end_unit"/>
+              <prop v="0" k="trim_distance_start"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_start_unit"/>
+              <prop v="0" k="tweak_dash_pattern_on_corners"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </lineSymbol>
+        <divisionLineSymbol>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+              </Option>
+              <prop v="0" k="align_dash_pattern"/>
+              <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"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="dash_pattern_offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+              <prop v="MM" k="dash_pattern_offset_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="trim_distance_end"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_end_unit"/>
+              <prop v="0" k="trim_distance_start"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_start_unit"/>
+              <prop v="0" k="tweak_dash_pattern_on_corners"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </divisionLineSymbol>
+        <subdivisionLineSymbol>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+              </Option>
+              <prop v="0" k="align_dash_pattern"/>
+              <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"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="dash_pattern_offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+              <prop v="MM" k="dash_pattern_offset_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="round" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.2" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="trim_distance_end"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_end_unit"/>
+              <prop v="0" k="trim_distance_start"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_start_unit"/>
+              <prop v="0" k="tweak_dash_pattern_on_corners"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </subdivisionLineSymbol>
+        <fillSymbol1>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
+              </Option>
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="0,0,0,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </fillSymbol1>
+        <fillSymbol2>
+          <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="" clip_to_extent="1" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+              <Option type="Map">
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
+              </Option>
+              <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" k="outline_width"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="solid" k="style"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </fillSymbol2>
+      </LayoutItem>
+      <LayoutItem zValue="1" mapFlags="0" frame="false" positionLock="true" mapRotation="0" id="" frameJoinStyle="miter" isTemporal="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" followPresetName="Fencing" background="false" referencePoint="0" itemRotation="0" drawCanvasItems="false" outlineWidthM="0.3,mm" size="283.418,180.92,mm" excludeFromExports="0" visibility="1" blendMode="0" opacity="0.9" groupUuid="" position="6.76779,9.35102,mm" type="65639" followPreset="true" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" keepLayerSet="false">
+        <FrameColor red="0" green="0" blue="0" alpha="255"/>
+        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option type="Map" name="transformer">
+                    <Option type="Map" name="d">
+                      <Option value="1" type="double" name="exponent"/>
+                      <Option value="360" type="double" name="maxOutput"/>
+                      <Option value="0" type="double" name="maxValue"/>
+                      <Option value="0" type="double" name="minOutput"/>
+                      <Option value="0" type="double" name="minValue"/>
+                      <Option value="0" type="double" name="nullOutput"/>
+                    </Option>
+                    <Option value="0" type="int" name="t"/>
+                  </Option>
+                  <Option value="3" type="int" name="type"/>
+                </Option>
+                <Option type="Map" name="dataDefinedRotation">
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="angle" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
+                </Option>
+              </Option>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.90819730717829827" ymax="-33.90718453497861162" xmax="18.40524827801807461" xmin="18.40366172969380543"/>
+        <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>
+            <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>
+        </crs>
+        <LayerSet/>
+        <ComposerMapGrid rightAnnotationDisplay="3" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" crossLength="3" maximumIntervalWidth="100" topFrameDivisions="0" unit="1" gridFrameMargin="0" annotationFormat="4" frameFillColor2="0,0,0,255" bottomFrameDivisions="0" leftFrameDivisions="0" name="Grid 1" topAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" blendMode="0" leftAnnotationPosition="1" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightAnnotationDirection="0" annotationPrecision="3" gridStyle="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="3" annotationExpression="" intervalY="5" minimumIntervalWidth="50" position="3" gridFramePenColor="0,0,0,255" bottomAnnotationPosition="1" intervalX="5" bottomAnnotationDisplay="3" topAnnotationDirection="0" rotatedTicksEnabled="0" leftAnnotationDirection="0" rightAnnotationPosition="1" showAnnotation="0" offsetY="0" rightFrameDivisions="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameWidth="2" gridFramePenThickness="0.5" offsetX="0" rotatedTicksLengthMode="0" show="0" gridFrameStyle="0" rotatedAnnotationsMarginToCorner="0">
+          <lineStyle>
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="line" name="" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleLine" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="195,195,195,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                </Option>
+                <prop v="0" k="align_dash_pattern"/>
+                <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"/>
+                <prop v="MM" k="customdash_unit"/>
+                <prop v="0" k="dash_pattern_offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+                <prop v="MM" k="dash_pattern_offset_unit"/>
+                <prop v="0" k="draw_inside_polygon"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="195,195,195,255" k="line_color"/>
+                <prop v="solid" k="line_style"/>
+                <prop v="0" k="line_width"/>
+                <prop v="MM" k="line_width_unit"/>
+                <prop v="0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0" k="ring_filter"/>
+                <prop v="0" k="trim_distance_end"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_end_unit"/>
+                <prop v="0" k="trim_distance_start"/>
+                <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+                <prop v="MM" k="trim_distance_start_unit"/>
+                <prop v="0" k="tweak_dash_pattern_on_corners"/>
+                <prop v="0" k="use_custom_dash"/>
+                <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </lineStyle>
+          <markerStyle>
+            <symbol is_animated="0" force_rhr="0" alpha="1" type="marker" name="" clip_to_extent="1" frame_rate="10">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <layer pass="0" class="SimpleMarker" locked="0" enabled="1">
+                <Option type="Map">
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                </Option>
+                <prop v="0" k="angle"/>
+                <prop v="square" k="cap_style"/>
+                <prop v="0,0,0,255" k="color"/>
+                <prop v="1" k="horizontal_anchor_point"/>
+                <prop v="bevel" k="joinstyle"/>
+                <prop v="circle" k="name"/>
+                <prop v="0,0" k="offset"/>
+                <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                <prop v="MM" k="offset_unit"/>
+                <prop v="0,0,0,255" k="outline_color"/>
+                <prop v="solid" k="outline_style"/>
+                <prop v="0" k="outline_width"/>
+                <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+                <prop v="MM" k="outline_width_unit"/>
+                <prop v="diameter" k="scale_method"/>
+                <prop v="2" k="size"/>
+                <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+                <prop v="MM" k="size_unit"/>
+                <prop v="1" k="vertical_anchor_point"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </markerStyle>
+          <spatialrefsys nativeFormat="Wkt">
+            <wkt>PROJCRS["WGS 84 / Pseudo-Mercator",BASEGEOGCRS["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]],ID["EPSG",4326]],CONVERSION["Popular Visualisation Pseudo-Mercator",METHOD["Popular Visualisation Pseudo Mercator",ID["EPSG",1024]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["False easting",0,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Web mapping and visualisation."],AREA["World between 85.06°S and 85.06°N."],BBOX[-85.06,-180,85.06,180]],ID["EPSG",3857]]</wkt>
+            <proj4>+proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +wktext +no_defs</proj4>
+            <srsid>3857</srsid>
+            <srid>3857</srid>
+            <authid>EPSG:3857</authid>
+            <description>WGS 84 / Pseudo-Mercator</description>
+            <projectionacronym>merc</projectionacronym>
+            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+            <geographicflag>false</geographicflag>
+          </spatialrefsys>
+          <text-style fontWeight="50" textOpacity="1" namedStyle="" fontSize="10" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" capitalization="0" allowHtml="0" fontItalic="0" textOrientation="horizontal" textColor="0,0,0,255" fontUnderline="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" blendMode="0" fontWordSpacing="0" fontKerning="1" forcedBold="0" fontFamily="Myriad Pro" fontSizeUnit="Point">
+            <families/>
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers=""/>
+            <background shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeDraw="0" shapeOpacity="1" shapeType="0" shapeJoinStyle="64" shapeBlendMode="0" shapeSizeX="0" shapeRotationType="0" shapeSizeY="0">
+              <symbol is_animated="0" force_rhr="0" alpha="1" type="fill" name="fillSymbol" clip_to_extent="1" frame_rate="10">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+                <layer pass="0" class="SimpleFill" locked="0" enabled="1">
+                  <Option type="Map">
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
+                  </Option>
+                  <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+                  <prop v="255,255,255,255" k="color"/>
+                  <prop v="bevel" k="joinstyle"/>
+                  <prop v="0,0" k="offset"/>
+                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                  <prop v="MM" k="offset_unit"/>
+                  <prop v="128,128,128,255" k="outline_color"/>
+                  <prop v="no" k="outline_style"/>
+                  <prop v="0" k="outline_width"/>
+                  <prop v="MM" k="outline_width_unit"/>
+                  <prop v="solid" k="style"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option value="" type="QString" name="name"/>
+                      <Option name="properties"/>
+                      <Option value="collection" type="QString" name="type"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </background>
+            <shadow shadowRadius="1.5" shadowBlendMode="6" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowOffsetGlobal="1"/>
+            <dd_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </dd_properties>
+          </text-style>
+          <LayoutObject>
+            <dataDefinedProperties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </dataDefinedProperties>
+            <customproperties>
+              <Option/>
+            </customproperties>
+          </LayoutObject>
+        </ComposerMapGrid>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
+      </LayoutItem>
+      <customproperties>
+        <Option type="Map">
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="int" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="1" type="int" name="pdfAppendGeoreference"/>
+          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
+          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="int" name="pdfIncludeMetadata"/>
+          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_5655c566_c302_4743_a580_b3593f83c018" type="QString" name="pdfLayerOrder"/>
+          <Option value="0" type="int" name="pdfLosslessImages"/>
+          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="int" name="pdfSimplify"/>
+          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="rasterize"/>
+          <Option value="true" type="bool" name="singleFile"/>
+        </Option>
+      </customproperties>
+      <Atlas sortFeatures="1" sortKey="&quot;group&quot;" filterFeatures="0" coverageLayerName="cone_only_groups" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="virtual" coverageLayer="cone_only_groups_5655c566_c302_4743_a580_b3593f83c018" 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'fenc%25'%20GROUP%20BY%20%22group%22" sortAscending="1" enabled="1" hideCoverage="1" pageNameExpression="&quot;name&quot;"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings rotation="0" UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmin="18.37956087983462439" xmax="18.4295149011373347" ymax="-33.89386282439181031" ymin="-33.92073397852443151">
+    <DefaultViewExtent ymin="-33.90890360779818025" ymax="-33.9021858192650285" xmax="18.4213002576920708" xmin="18.40881175236639322">
       <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>
@@ -35739,41 +37916,41 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1">
+  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStepUnit="h" frameRate="1" timeStep="1" cumulativeTemporalRange="0"/>
+  <ProjectTimeSettings timeStepUnit="h" timeStep="1" frameRate="1" cumulativeTemporalRange="0"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider offset="0" scale="1"/>
+      <TerrainProvider scale="1" offset="0"/>
     </terrainProvider>
   </ElevationProperties>
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option name="decimal_separator" value="" type="QChar"/>
-        <Option name="decimals" value="6" type="int"/>
-        <Option name="direction_format" value="0" type="int"/>
-        <Option name="rounding_type" value="0" type="int"/>
-        <Option name="show_plus" value="false" type="bool"/>
-        <Option name="show_thousand_separator" value="true" type="bool"/>
-        <Option name="show_trailing_zeros" value="false" type="bool"/>
-        <Option name="thousand_separator" value="" type="QChar"/>
+        <Option value="" type="QChar" name="decimal_separator"/>
+        <Option value="6" type="int" name="decimals"/>
+        <Option value="0" type="int" name="direction_format"/>
+        <Option value="0" type="int" name="rounding_type"/>
+        <Option value="false" type="bool" name="show_plus"/>
+        <Option value="true" type="bool" name="show_thousand_separator"/>
+        <Option value="false" type="bool" name="show_trailing_zeros"/>
+        <Option value="" type="QChar" name="thousand_separator"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option name="angle_format" value="DecimalDegrees" type="QString"/>
-        <Option name="decimal_separator" value="" type="QChar"/>
-        <Option name="decimals" value="6" type="int"/>
-        <Option name="rounding_type" value="0" type="int"/>
-        <Option name="show_leading_degree_zeros" value="false" type="bool"/>
-        <Option name="show_leading_zeros" value="false" type="bool"/>
-        <Option name="show_plus" value="false" type="bool"/>
-        <Option name="show_suffix" value="false" type="bool"/>
-        <Option name="show_thousand_separator" value="true" type="bool"/>
-        <Option name="show_trailing_zeros" value="false" type="bool"/>
-        <Option name="thousand_separator" value="" type="QChar"/>
+        <Option value="DecimalDegrees" type="QString" name="angle_format"/>
+        <Option value="" type="QChar" name="decimal_separator"/>
+        <Option value="6" type="int" name="decimals"/>
+        <Option value="0" type="int" name="rounding_type"/>
+        <Option value="false" type="bool" name="show_leading_degree_zeros"/>
+        <Option value="false" type="bool" name="show_leading_zeros"/>
+        <Option value="false" type="bool" name="show_plus"/>
+        <Option value="false" type="bool" name="show_suffix"/>
+        <Option value="true" type="bool" name="show_thousand_separator"/>
+        <Option value="false" type="bool" name="show_trailing_zeros"/>
+        <Option value="" type="QChar" name="thousand_separator"/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/fencing.dbf b/GIS Base Map/fencing.dbf
index 97c3da2..6bfc370 100644
Binary files a/GIS Base Map/fencing.dbf and b/GIS Base Map/fencing.dbf differ